diff --git a/README.md b/README.md index 15e6c86e..fb990ebc 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The Blogophon _generator_ works on every platform with [NodeJs](https://nodejs.o Installation ------------ -1. Make sure you have [Node.js](https://nodejs.org/) installed by calling `node -v`. +1. Make sure you have [Node.js](https://nodejs.org/) with at least version 4 installed by calling `node -v`. 1. Make sure you have [ImageMagick](http://www.imagemagick.org/) installed by calling `magick -help`. ImageMagick is needed for scaling images. 1. Run `npm install -g blogophon` to install the Blogophon. 1. Change to a folder you want to initialize a Blogophon blog project in. diff --git a/generate.js b/generate.js index 100b16c2..fdd4a241 100755 --- a/generate.js +++ b/generate.js @@ -1,12 +1,12 @@ #!/usr/bin/env node 'use strict'; -var application = require('./src/helpers/application')(); +const application = require('./src/helpers/application')(); application.changeDirectory(); -var Generator = require('./src/generator'); -var args = require('./src/helpers/arguments')(); -var config = require('./src/config'); +const Generator = require('./src/generator'); +const args = require('./src/helpers/arguments')(); +const config = require('./src/config'); if (args.help) { console.log('Usage: node generate.js [OPTIONS]'); @@ -24,20 +24,20 @@ if (args.help) { console.log('---- ' + new Date() + ' -----'); } -var generator = Generator(config); +const generator = Generator(config); generator .getArticles() - .then(function() { + .then(() => { return generator.buildAll(args.force || args.f, args.noimages || args.I); }) - .then(function() { + .then(() => { if(args.deploy || args.d || args.publish) { generator.deploy(); } else { console.log('Done'); } }) - .catch(function(err) { + .catch((err) => { console.error(err); process.exit(1); }) ; diff --git a/gulpfile.js b/gulpfile.js index 69a3ee82..f811ed08 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,25 +1,25 @@ 'use strict'; // Include gulp -var gulp = require('gulp'); -var pkg = require('./package.json'); -var beep = require('beepbeep'); -var onError = function() { +let gulp = require('gulp'); +let pkg = require('./package.json'); +let beep = require('beepbeep'); +let onError = function() { beep(); return true; }; // Include Our Plugins -var eslint = require('gulp-eslint'); -var nodeunit = require('gulp-nodeunit'); -var gls = require('gulp-live-server'); -var plumber = require('gulp-plumber'); -var sass = require('gulp-sass'); -var rename = require("gulp-rename"); -var uglify = require('gulp-uglify'); -var postcss = require('gulp-postcss'); -var replace = require('gulp-replace'); -var autoprefixer = require('autoprefixer'); +let eslint = require('gulp-eslint'); +let nodeunit = require('gulp-nodeunit'); +let gls = require('gulp-live-server'); +let plumber = require('gulp-plumber'); +let sass = require('gulp-sass'); +let rename = require("gulp-rename"); +let uglify = require('gulp-uglify'); +let postcss = require('gulp-postcss'); +let replace = require('gulp-replace'); +let autoprefixer = require('autoprefixer'); // Lint Task gulp.task('eslint', function() { @@ -102,7 +102,7 @@ gulp.task('build-css', function() { }); gulp.task('serve', function() { - var server = gls.static(pkg.directories.htdocs); + let server = gls.static(pkg.directories.htdocs); server.start(); gulp.watch(pkg.directories.htdocs + '/**/*', function(file) { /* eslint-disable */ diff --git a/index.js b/index.js index 78e707ae..45e088bb 100755 --- a/index.js +++ b/index.js @@ -1,11 +1,11 @@ #!/usr/bin/env node 'use strict'; -var application = require('./src/helpers/application')(); +const application = require('./src/helpers/application')(); application.changeDirectory(); -var blogophonConsole = require('./src/blogophon-console'); -var args = require('./src/helpers/arguments')(); +const blogophonConsole = require('./src/blogophon-console'); +const args = require('./src/helpers/arguments')(); if (args.help) { console.log('Usage: node index.js [OPTIONS]'); diff --git a/package.json b/package.json index 46799456..2debb19f 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,9 @@ "env": { "node": true }, + "parserOptions": { + "ecmaVersion": 6 + }, "globals": {}, "rules": { "brace-style": 2, @@ -133,11 +136,14 @@ "no-multi-str": 2, "valid-jsdoc": [ 1 - ] + ], + "no-var": 2 }, "extends": [ "eslint:recommended" ] }, - "engine": "node >= 0.12.0" + "engine": { + "node": ">=4" + } } diff --git a/src/blogophon-console.js b/src/blogophon-console.js index 13e35a39..474fe00f 100644 --- a/src/blogophon-console.js +++ b/src/blogophon-console.js @@ -1,26 +1,26 @@ 'use strict'; -var inquirer = require('inquirer'); -var fs = require('fs-extra-promise'); -var path = require('path'); -var shell = require('shelljs'); -var config = require('./config'); -var Mustache = require('./helpers/blogophon-mustache'); -var setup = require('./setup')(); -var Generator = require('./generator'); -var blogophonDate = require('./models/blogophon-date'); -var blogophonEditor = require('./editor')(config); +const inquirer = require('inquirer'); +const fs = require('fs-extra-promise'); +const path = require('path'); +const shell = require('shelljs'); +const config = require('./config'); +const Mustache = require('./helpers/blogophon-mustache'); +const setup = require('./setup')(); +const Generator = require('./generator'); +const blogophonDate = require('./models/blogophon-date'); +const blogophonEditor = require('./editor')(config); /** * Represents the Inquirer dialog with which to edit articles. * @constructor * @return {Object} [description] */ -var BlogophonConsole = function() { - var external = {}; - var internal = {}; - var files = []; - var choicesStr = [ +const BlogophonConsole = function() { + const external = {}; + const internal = {}; + let files = []; + const choicesStr = [ 'Create new article', 'Edit existing article', 'Rename article', @@ -42,7 +42,7 @@ var BlogophonConsole = function() { * @return {Array} [description] */ internal.makeChoices = function() { - var choices = []; + let choices = []; if (!config.notInitialized) { files = blogophonEditor.makeFiles(new inquirer.Separator()); choices.push(choicesStr[0]); @@ -66,7 +66,7 @@ var BlogophonConsole = function() { } else { console.log(markdownFilename + ' created'); if (templateData.edit) { - var cmd = config.isWin + let cmd = config.isWin ? 'START ' + markdownFilename : 'open ' + markdownFilename + ' || vi '+ markdownFilename ; @@ -85,10 +85,10 @@ var BlogophonConsole = function() { * @return {[type]} [description] */ external.setupDialog = function() { - var themesAvailable= fs.readdirSync(config.directories.theme).filter(function(file) { + let themesAvailable= fs.readdirSync(config.directories.theme).filter(function(file) { return fs.statSync(path.join(config.directories.theme, file)).isDirectory(); }); - var questions = [ + let questions = [ { type: 'input', name: 'name', @@ -256,7 +256,7 @@ var BlogophonConsole = function() { * @return {[type]} [description] */ external.createArticleDialog = function() { - var defaults = { + let defaults = { classes: 'Normal article', link: '', location: '', @@ -300,7 +300,7 @@ var BlogophonConsole = function() { } }; - var questions = [ + let questions = [ { type: 'list', name: 'classes', @@ -318,7 +318,7 @@ var BlogophonConsole = function() { if (v.trim().length <= 2) { return 'This title is way too short.'; } - var filename = blogophonEditor.filenameFromTitle(v); + let filename = blogophonEditor.filenameFromTitle(v); if (fs.existsSync(filename)) { return ("File " + filename + ' already exists'); } @@ -440,9 +440,9 @@ var BlogophonConsole = function() { function(answers) { answers.title = answers.title || Math.round(new Date().getTime() / 1000); answers.date = answers.date || defaults.date; - var markdownFilename = blogophonEditor.filenameFromTitle(blogophonEditor.titleForFilename(answers.title, config, answers.date)) + '.md'; - var filename = blogophonEditor.dirnameFromFilename(markdownFilename); // TODO: There is a class for that - var templateData = answers; + let markdownFilename = blogophonEditor.filenameFromTitle(blogophonEditor.titleForFilename(answers.title, config, answers.date)) + '.md'; + let filename = blogophonEditor.dirnameFromFilename(markdownFilename); // TODO: There is a class for that + let templateData = answers; templateData.isMicropost = (answers.classes === 'Micro post'); templateData.lead = templateData.lead || defaults.lead(answers); templateData.mainText = templateData.mainText || defaults.mainText(answers); @@ -473,7 +473,7 @@ var BlogophonConsole = function() { * @return {void} [description] */ external.editArticleDialog = function() { - var questions = [ + let questions = [ { type: 'list', name: 'file', @@ -483,8 +483,8 @@ var BlogophonConsole = function() { ]; inquirer.prompt(questions).then( function(answers) { - var markdownFilename = path.join(config.directories.data, answers.file); - var cmd = config.isWin ? 'START ' + markdownFilename : 'open ' + markdownFilename + ' || vi '+ markdownFilename; + let markdownFilename = path.join(config.directories.data, answers.file); + let cmd = config.isWin ? 'START ' + markdownFilename : 'open ' + markdownFilename + ' || vi '+ markdownFilename; console.log('$ ' + cmd); shell.exec(cmd); external.init(); @@ -500,7 +500,7 @@ var BlogophonConsole = function() { * @return {void} [description] */ external.renameArticleDialog = function() { - var questions = [ + let questions = [ { type: 'list', name: 'file', @@ -521,8 +521,8 @@ var BlogophonConsole = function() { inquirer.prompt(questions).then( function(answers) { if (answers.fileNew) { - var processed = 0, maxProcessed = 2; - var checkProcessed = function(err) { + let processed = 0, maxProcessed = 2; + let checkProcessed = function(err) { if (err) { console.error(err); } @@ -565,7 +565,7 @@ var BlogophonConsole = function() { * @return {void} [description] */ external.deleteArticleDialog = function() { - var questions = [ + let questions = [ { type: 'list', name: 'file', @@ -581,8 +581,8 @@ var BlogophonConsole = function() { inquirer.prompt(questions).then( function(answers) { if (answers.sure) { - var processed = 0, maxProcessed = 3; - var checkProcessed = function(err) { + let processed = 0, maxProcessed = 3; + let checkProcessed = function(err) { if (err) { console.error(err); } @@ -610,7 +610,7 @@ var BlogophonConsole = function() { * @return {void} [description] */ external.generateDialog = function() { - var questions = [ + let questions = [ { type: 'confirm', name: 'noforce', @@ -626,8 +626,8 @@ var BlogophonConsole = function() { } } ]; - var generator = Generator(config); - var answers; + let generator = Generator(config); + let answers; inquirer .prompt(questions) .then(function(inquirerAnswers) { @@ -659,7 +659,7 @@ var BlogophonConsole = function() { fs.ensureDirSync(config.directories.htdocs); external.setupDialog(); } else { - var questions = [ + let questions = [ { type: 'list', name: 'action', diff --git a/src/blogophon-index.js b/src/blogophon-index.js index 9bfb00da..a466a11d 100644 --- a/src/blogophon-index.js +++ b/src/blogophon-index.js @@ -5,9 +5,9 @@ * @constructor * @return {blogophonIndex} [description] */ -var blogophonIndex = function() { - var external = {}; - var internal = {}; +const blogophonIndex = function() { + const external = {}; + const internal = {}; external.index = []; internal.isSorted = true; @@ -71,8 +71,8 @@ var blogophonIndex = function() { if (!internal.isSorted) { external.sortblogophonIndex(); } - var now = Math.round(new Date().getTime() / 1000); - var count = 0, i; + let now = Math.round(new Date().getTime() / 1000); + let count = 0, i; for(i = 0; i < external.index.length; i++) { if (external.index[i].meta.Created.timestamp > now) { count++; @@ -91,10 +91,10 @@ var blogophonIndex = function() { * @return {[type]} [description] */ external.removeDrafts = function() { - var newIndex = external.index.filter(function(value) { + let newIndex = external.index.filter(function(value) { return !value.meta.Draft; }); - var count = external.index.length - newIndex.length; + let count = external.index.length - newIndex.length; external.index = newIndex; return count; }; @@ -107,7 +107,7 @@ var blogophonIndex = function() { if (!internal.isSorted) { external.sortblogophonIndex(); } - var i; + let i; for(i = 0; i < external.index.length; i++) { if (i > 0 && external.index[i-1]) { external.index[i].prev = external.index[i-1].meta; @@ -139,7 +139,7 @@ var blogophonIndex = function() { if (!internal.isSorted) { external.sortblogophonIndex(); } - var tags = {}; + let tags = {}; external.index.forEach(function(post){ if (post.meta.Tags) { post.meta.Tags.forEach(function(tag){ @@ -162,7 +162,7 @@ var blogophonIndex = function() { if (!internal.isSorted) { external.sortblogophonIndex(); } - var authors = {}; + let authors = {}; external.index.forEach(function(post){ if (post.meta.AuthorName) { if (!authors[post.meta.AuthorName]) { @@ -204,7 +204,7 @@ var blogophonIndex = function() { if (!itemsPerPage) { itemsPerPage = 10; } - var pages = [], page = 0, newblogophonIndex = external.index, currentSlice = []; + let pages = [], page = 0, newblogophonIndex = external.index, currentSlice = []; if (reverse) { newblogophonIndex = newblogophonIndex.reverse(); } diff --git a/src/config.js b/src/config.js index 326e8659..839c43a6 100644 --- a/src/config.js +++ b/src/config.js @@ -1,13 +1,13 @@ 'use strict'; -var fs = require('fs'); -var path = require('path'); +const fs = require('fs'); +const path = require('path'); /** * Returns an object with all configuration settings found in `package.json` and `config.json`. */ -var pkg = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8')); -var config = {}; +const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8')); +let config = {}; try { config = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'user', 'config.json'), 'utf8')); } catch (e) { diff --git a/src/editor.js b/src/editor.js index dd8ff155..75bf3f1f 100644 --- a/src/editor.js +++ b/src/editor.js @@ -1,16 +1,16 @@ 'use strict'; -var glob = require('glob'); -var fs = require('fs-extra-promise'); -var path = require('path'); -var shell = require('shelljs'); -var https = require('https'); -var blogophonDate = require('./models/blogophon-date'); -var SuperString = require('./helpers/super-string'); -var Mustache = require('./helpers/blogophon-mustache'); +const glob = require('glob'); +const fs = require('fs-extra-promise'); +const path = require('path'); +const shell = require('shelljs'); +const https = require('https'); +const blogophonDate = require('./models/blogophon-date'); +const SuperString = require('./helpers/super-string'); +const Mustache = require('./helpers/blogophon-mustache'); -var editor = function(config) { - var external = {}; +const editor = function(config) { + const external = {}; /** * Get listing of all Markdown files which may be edited @@ -18,11 +18,11 @@ var editor = function(config) { * @return {Array} [description] */ external.makeFiles = function(separator) { - var files = []; + let files = []; if (!config.notInitialized) { files = glob.sync(config.directories.data + "/**/*.{md,md~}").map(function(v) { - var filename = v.replace(/^.+\/(.+?)$/, '$1'); - var fileStat = fs.lstatSync(v); + let filename = v.replace(/^.+\/(.+?)$/, '$1'); + let fileStat = fs.lstatSync(v); return { name: fileStat.mtime.toLocaleString(config.locale.language || 'en') + "\t" + filename + "\t" +Math.ceil(fileStat.size/1000)+' kB', @@ -101,12 +101,12 @@ var editor = function(config) { host: 'nominatim.openstreetmap.org', path: '/search?q='+encodeURIComponent(address)+'&format=json&accept-language='+encodeURIComponent(language || 'en') }, function(response) { - var body = ''; + let body = ''; response.on('data', function(d) { body += d; }); response.on('end', function() { - var parsed = JSON.parse(body); + let parsed = JSON.parse(body); callback(null, { latitude: parsed[0] ? parsed[0].lat : null, longitude: parsed[0] ? parsed[0].lon : null diff --git a/src/generator.js b/src/generator.js index f9ec41da..b5897965 100644 --- a/src/generator.js +++ b/src/generator.js @@ -1,36 +1,36 @@ 'use strict'; -var glob = require("glob"); -var Promise = require('promise/lib/es6-extensions'); -var fs = require('fs-extra-promise'); -var path = require('path'); -var SuperString = require('./helpers/super-string'); -var blogophonDate = require('./models/blogophon-date'); -var Mustache = require('./helpers/blogophon-mustache'); -var PostReader = require('./post-reader'); -var jsonRss = require('./models/json-rss'); -var geoJson = require('./models/geo-json'); -var translations = require('./helpers/translations'); -var indexUrl = require('./helpers/index-url'); -var blogophonIndex = require('./blogophon-index'); -var hashes = require('./models/hashes'); -var appleNewsFormat = require('./models/apple-news-format'); -var imageStyles = require('./helpers/image-styles'); -var ampify = require('./helpers/ampify')(); -var slacked = require('./models/slacked'); -var jsonFeed = require('./models/json-feed'); +const glob = require("glob"); +const Promise = require('promise/lib/es6-extensions'); +const fs = require('fs-extra-promise'); +const path = require('path'); +const SuperString = require('./helpers/super-string'); +const blogophonDate = require('./models/blogophon-date'); +const Mustache = require('./helpers/blogophon-mustache'); +const PostReader = require('./post-reader'); +const jsonRss = require('./models/json-rss'); +const geoJson = require('./models/geo-json'); +const translations = require('./helpers/translations'); +const indexUrl = require('./helpers/index-url'); +const blogophonIndex = require('./blogophon-index'); +const hashes = require('./models/hashes'); +const appleNewsFormat = require('./models/apple-news-format'); +const imageStyles = require('./helpers/image-styles'); +const ampify = require('./helpers/ampify')(); +const slacked = require('./models/slacked'); +const jsonFeed = require('./models/json-feed'); /** * Generator used for creating the blog. * @constructor * @param {Object} config [description] */ -var Generator = function(config) { +const Generator = function(config) { if (!config) { throw new Error('config is empty'); } - var external = {}; - var internal = {}; + const external = {}; + const internal = {}; Mustache.getTemplates(); Mustache.getThemeTemplates(path.join(config.directories.currentTheme, 'templates')); @@ -57,7 +57,7 @@ var Generator = function(config) { reject(err); } // Making promises - var promises = files.map(function(i) { + let promises = files.map(function(i) { return PostReader(i, config); }); // Checking promises @@ -84,9 +84,9 @@ var Generator = function(config) { * @return {Promise} with first parameter of `resolve` being the list of files generated. */ external.buildAllArticles = function(force, noimages) { - var allPosts = internal.currentIndex.getPosts(); - var skipped = 0; - var generatedArticles = []; + let allPosts = internal.currentIndex.getPosts(); + let skipped = 0; + let generatedArticles = []; if (force && !noimages) { fs.removeSync(path.join(config.directories.htdocs, config.htdocs.posts, '*')); @@ -95,7 +95,7 @@ var Generator = function(config) { return new Promise( function(resolve, reject) { // Making promises - var promises = allPosts.map(function(post) { + let promises = allPosts.map(function(post) { if (!force && internal.hashes.matchesHash(post.meta.Url, post.hash)) { skipped++; } else { @@ -130,7 +130,7 @@ var Generator = function(config) { return new Promise( function(resolve, reject) { fs.ensureDirSync(post.meta.urlObj.dirname()); - var promises = [ + let promises = [ fs.writeFileAsync(post.meta.urlObj.filename(), Mustache.renderExtra(Mustache.themeTemplates.postHtml, { post: post, config: config @@ -180,15 +180,15 @@ var Generator = function(config) { return false; } // Target directory - var sourceDirectory = post.filename.replace(/\.md$/, '') + "/"; // Source directory - var sourceGlob = glob.sync(sourceDirectory + "*.{png,jpg,gif}"); - var sourceReg = new RegExp(sourceDirectory); - var imageStyles = sourceGlob ? post.getAllImagesWithStyleObject() : {}; + let sourceDirectory = post.filename.replace(/\.md$/, '') + "/"; // Source directory + let sourceGlob = glob.sync(sourceDirectory + "*.{png,jpg,gif}"); + let sourceReg = new RegExp(sourceDirectory); + let imageStyles = sourceGlob ? post.getAllImagesWithStyleObject() : {}; return new Promise( function(resolve, reject) { - var promises = sourceGlob.map(function(sourceFile) { - var targetFile = sourceFile.replace(sourceReg, config.directories.htdocs + post.meta.Url); + let promises = sourceGlob.map(function(sourceFile) { + let targetFile = sourceFile.replace(sourceReg, config.directories.htdocs + post.meta.Url); fs.copySync(sourceFile, targetFile); //console.log(imageStyles[path.basename(sourceFile)] || []); return internal.imageStyles.generateImagesWithStyles(sourceFile, targetFile, imageStyles[path.basename(sourceFile)] || []); @@ -196,7 +196,7 @@ var Generator = function(config) { Promise .all(promises) .then(function(generatedImages) { - var processed = 0; + let processed = 0; if (promises.length > 0) { processed = generatedImages.reduce(function(accumulatedValue, generatedImage) { return accumulatedValue + generatedImage; @@ -218,7 +218,7 @@ var Generator = function(config) { external.buildSpecialPages = function() { return new Promise( function(resolve, reject) { - var promises = [ + let promises = [ external.buildIndexFiles(), external.buildTagPages(), external.buildMetaFiles() @@ -254,9 +254,9 @@ var Generator = function(config) { return new Promise( function(resolve, reject) { - var page; - var pagedPosts = index.getPagedPosts(config.itemsPerPage); - var urls = { + let page; + let pagedPosts = index.getPagedPosts(config.itemsPerPage); + let urls = { indexHtml: indexUrl(path + 'index.html'), rss: indexUrl(path + 'posts.rss'), jsonrss: indexUrl(path + 'rss.json'), @@ -270,8 +270,8 @@ var Generator = function(config) { ics: indexUrl(path + 'posts.ics'), ajax: indexUrl(path + 'index.json') }; - var promises = []; - var pubDate = blogophonDate(index.pubDate); + let promises = []; + let pubDate = blogophonDate(index.pubDate); if (config.specialFeatures.rss || config.specialFeatures.facebookinstantarticles) { promises.push(fs.writeFileAsync( urls.rss.filename(), Mustache.render(Mustache.templates.rssXml, { index: index.getPosts(10), @@ -349,8 +349,8 @@ var Generator = function(config) { } for (page = 0; page < pagedPosts.length; page ++) { - var curPageObj = index.getPageData(page, pagedPosts.length, false, path); - var curUrlObj = indexUrl(curPageObj.currentUrl); + let curPageObj = index.getPageData(page, pagedPosts.length, false, path); + let curUrlObj = indexUrl(curPageObj.currentUrl); curPageObj.index = pagedPosts[page]; curPageObj.config = config; curPageObj.meta = { @@ -404,8 +404,8 @@ var Generator = function(config) { * @return {Promise} with first parameter of `resolve` being the number of files converted. */ external.buildTagPages = function() { - var tags = internal.currentIndex.getTags(); - var tagPages = Object.keys(tags).sort().map(function(key) { + let tags = internal.currentIndex.getTags(); + let tagPages = Object.keys(tags).sort().map(function(key) { return { title: tags[key].title, url: tags[key].urlObj.relativeUrl() @@ -417,7 +417,7 @@ var Generator = function(config) { return new Promise( function(resolve, reject) { - var promises = Object.keys(tags).map(function(key) { + let promises = Object.keys(tags).map(function(key) { return external.buildIndexFiles( tags[key].index, '/'+tags[key].urlObj.relativeDirname()+'/', @@ -453,8 +453,8 @@ var Generator = function(config) { * @return {Promise} with first parameter of `resolve` being the number of files converted. */ external.buildAuthorPages = function() { - var authors = internal.currentIndex.getAuthors(); - var authorPages = Object.keys(authors).sort().map(function(name) { + let authors = internal.currentIndex.getAuthors(); + let authorPages = Object.keys(authors).sort().map(function(name) { return { title: name, url: authors[name].urlObj.relativeUrl() @@ -469,7 +469,7 @@ var Generator = function(config) { } fs.ensureDirSync(path.join(config.directories.htdocs, config.htdocs.author)); - var promises = Object.keys(authors).map(function(name) { + let promises = Object.keys(authors).map(function(name) { return external.buildIndexFiles( authors[name].index, '/'+authors[name].urlObj.relativeDirname()+'/', @@ -512,7 +512,7 @@ var Generator = function(config) { external.buildMetaFiles = function() { return new Promise( function(resolve, reject) { - var promises = [ + let promises = [ fs.writeFileAsync( indexUrl('404.html').filename(), Mustache.renderExtra( @@ -591,7 +591,7 @@ var Generator = function(config) { * @return {Boolean} [description] */ external.deploy = function() { - var shell = require('shelljs'); + let shell = require('shelljs'); if (config.deployCmd) { console.log('Deploying...'); shell.exec('cd '+path.join(__dirname, '..')+'; ' + config.deployCmd); diff --git a/src/helpers/ampify.js b/src/helpers/ampify.js index 346ffc28..5169b137 100644 --- a/src/helpers/ampify.js +++ b/src/helpers/ampify.js @@ -1,7 +1,7 @@ 'use strict'; -var ampify = function() { - var external = {}; +const ampify = function() { + const external = {}; /** * Convert regular HTML in AMP-HTML. @@ -24,8 +24,8 @@ var ampify = function() { .replace(/( (width)="[^"]*")([^>]* \2="[^"]*")/g, '$3') .replace(/(]+) allowfullscreen=".+?"/g, '$1') .replace(/
]*>([\s\S]+?)<\/div>/g, function(all, content) { - var width = html.match(/width="(\d+)"/) || ['', '640']; - var height = html.match(/height="(\d+)"/) || ['', '360']; + let width = html.match(/width="(\d+)"/) || ['', '640']; + let height = html.match(/height="(\d+)"/) || ['', '360']; content = content.replace(/<\/?a(\s[^>]+)?>/g, ''); return ''+content+''; }) @@ -57,15 +57,15 @@ var ampify = function() { * @return {Object} [description] */ external.getConsolidatedProperties = function(index) { - var properties = ['ampProperties', 'ampPropertiesTeaser']; - var consolidatedProperties = {}; + let properties = ['ampProperties', 'ampPropertiesTeaser']; + let consolidatedProperties = {}; index.forEach(function(post) { properties.forEach(function(property) { if (post[property]) { if (!consolidatedProperties[property]) { consolidatedProperties[property] = post[property]; } else { - for (var key in post[property]) { + for (let key in post[property]) { consolidatedProperties[property][key] |= post[property][key]; } } diff --git a/src/helpers/application.js b/src/helpers/application.js index 02748888..caf8cd65 100644 --- a/src/helpers/application.js +++ b/src/helpers/application.js @@ -1,22 +1,22 @@ 'use strict'; -var fs = require('fs'); -var path = require('path'); +const fs = require('fs'); +const path = require('path'); /** * Basic apllication stuff * @constructor * @return {Object} [description] */ -var application = function() { - var external = {}; +const application = function() { + const external = {}; /** * Search upward until valid project is found, and cange into this directory. * @return {[type]} [description] */ external.changeDirectory = function() { - var foundDirectory = external.findDirectory(); + let foundDirectory = external.findDirectory(); //console.log(foundDirectory); if (foundDirectory) { process.chdir(foundDirectory); diff --git a/src/helpers/arguments.js b/src/helpers/arguments.js index 7093c8ea..268b8559 100644 --- a/src/helpers/arguments.js +++ b/src/helpers/arguments.js @@ -4,11 +4,11 @@ * List of arguments from command line * @constructor */ -var args = function() { - var external = {}; +const args = function() { + const external = {}; if (process.argv && process.argv.length > 1) { process.argv.forEach(function(arg, i) { - var m = arg.match(/^--?(.+?)(?:=(.+))?$/); + let m = arg.match(/^--?(.+?)(?:=(.+))?$/); if (i >= 2 && m) { external[m[1].replace(/-+/g, '')] = m[2] ? m[2] : true; } diff --git a/src/helpers/author-url.js b/src/helpers/author-url.js index 7e780297..5378a514 100644 --- a/src/helpers/author-url.js +++ b/src/helpers/author-url.js @@ -1,7 +1,7 @@ 'use strict'; -var url = require('../helpers/url'); -var SuperString = require('../helpers/super-string'); +const url = require('../helpers/url'); +const SuperString = require('../helpers/super-string'); /** * [authorUrl description] @@ -9,8 +9,8 @@ var SuperString = require('../helpers/super-string'); * @param {String} path [description] * @return {Object} [description] */ -var authorUrl = function(identifier, path) { - var external = url(identifier); +const authorUrl = function(identifier, path) { + const external = url(identifier); external.path = path || 'authored-by'; external.convert = function(base, type) { diff --git a/src/helpers/blogophon-mustache-quoters.js b/src/helpers/blogophon-mustache-quoters.js index e9edab82..de4bcad4 100644 --- a/src/helpers/blogophon-mustache-quoters.js +++ b/src/helpers/blogophon-mustache-quoters.js @@ -1,9 +1,9 @@ 'use strict'; -var blogophonMustacheQuoters = { +const blogophonMustacheQuoters = { icsQuote: function() { return function(text, render) { - var newText = render(text) + let newText = render(text) .replace(/(\n|\r|\r\n)/g, "\\n") .replace(/(,|;)/g, '\\$1'); if (newText.length > 30) { diff --git a/src/helpers/blogophon-mustache.js b/src/helpers/blogophon-mustache.js index 54db998d..c854a704 100644 --- a/src/helpers/blogophon-mustache.js +++ b/src/helpers/blogophon-mustache.js @@ -3,10 +3,10 @@ /** * This adds additonal functionality to Mustache. */ -var Mustache = require('mustache'); -var fs = require('fs'); -var path = require('path'); -var MustacheQuoters= require('./blogophon-mustache-quoters'); +const Mustache = require('mustache'); +const fs = require('fs'); +const path = require('path'); +const MustacheQuoters= require('./blogophon-mustache-quoters'); /** * Get theme templates and load them into Mustache.themeTemplates @@ -35,13 +35,13 @@ Mustache.getTemplates = function() { * @return {Object} [description] */ Mustache.getTemplateObject = function(directory) { - var templateObject = {}; + let templateObject = {}; fs .readdirSync(directory) .forEach(function(filename) { - var absFile = path.join(directory, filename); + let absFile = path.join(directory, filename); if (fs.statSync(absFile).isFile()){ - var key = filename + let key = filename .replace(/^[^a-zA-Z0-9]/g, '') .replace(/[^a-zA-Z0-9]/g, ' ') .replace(/(?:^\w|[A-Z]|\b\w)/g, function(letter, index) { @@ -61,7 +61,7 @@ Mustache.getTemplateObject = function(directory) { * @return {String} [description] */ Mustache.escape = function(string) { - var entityMap = { + let entityMap = { '&': '&', '<': '<', '>': '>', @@ -81,7 +81,7 @@ Mustache.escape = function(string) { * @return {String} [description] */ Mustache.renderExtra = function(template, view, partials) { - for (var key in MustacheQuoters) { + for (let key in MustacheQuoters) { if (!view[key]) { view[key] = MustacheQuoters[key]; } diff --git a/src/helpers/image-styles.js b/src/helpers/image-styles.js index cd911b2f..bb8bfe41 100644 --- a/src/helpers/image-styles.js +++ b/src/helpers/image-styles.js @@ -1,7 +1,7 @@ 'use strict'; -var gm = require('gm').subClass({imageMagick: true}); -var Promise = require('promise/lib/es6-extensions'); +const gm = require('gm').subClass({imageMagick: true}); +const Promise = require('promise/lib/es6-extensions'); /** * Converts images and replaces HTML for image integration. @@ -9,9 +9,9 @@ var Promise = require('promise/lib/es6-extensions'); * @param {Object} config [description] * @return {Object} [description] */ -var imageStyles = function(config) { - var external = {}; - var internal = {}; +const imageStyles = function(config) { + const external = {}; + const internal = {}; internal.jpgQuality = 85; @@ -55,13 +55,13 @@ var imageStyles = function(config) { if (!targetFilename) { throw new Error('No target filename given for conversion'); } - var styleData = internal.getStyle(style); - var processed = 0; - var maxProcessed = styleData.srcset.length; + let styleData = internal.getStyle(style); + let processed = 0; + let maxProcessed = styleData.srcset.length; return new Promise( function(resolve, reject) { - var checkProcessed = function(err) { + let checkProcessed = function(err) { if (err) { reject(err); } @@ -101,11 +101,11 @@ var imageStyles = function(config) { throw new Error('No target filename given for conversion'); } styles = styles || Object.keys(config.themeConf.imageStyles); - var processed = 0; + let processed = 0; return new Promise( function(resolve, reject) { - var promises = styles.map(function(style) { + let promises = styles.map(function(style) { return external.generateImagesFromStyle(sourceFilename, targetFilename, style); }); Promise @@ -147,15 +147,15 @@ var imageStyles = function(config) { */ internal.parseImagesReplace = function(all, filename, style) { style = style || "default"; - var html; + let html; if (style.match(/^\d+x\d+$/)) { html = '': if (chunk.match(/'; } else { @@ -168,7 +168,7 @@ var markyMark = function(string, rules) { * @return {String} [description] */ internal.convertText = function(string) { - var entityMap = { + let entityMap = { '...': '…', '… …': '…', '(C)': '©', @@ -266,9 +266,9 @@ var markyMark = function(string, rules) { return codeRest; }; breaker = breaker || /(\/\*[\S\s]+?\*\/|(?:\/\/|#).+?[\n\r]|".*?"|'[^']*?'|`[^`]*?`)/g; - var myArray; - var chunks = []; - var lastIndex = 0; + let myArray; + let chunks = []; + let lastIndex = 0; code = code.replace(/'/g, "'"); while ((myArray = breaker.exec(code)) !== null) { @@ -304,7 +304,7 @@ var markyMark = function(string, rules) { internal.convertCode = function(string) { return internal.convertGeneralCode(string, function(codeRest) { return codeRest - .replace(/(^|\b)(var|function|method|class|const|external|internal|protected|use|namespace|public|private)(\b)/g, '$1$2$3') + .replace(/(^|\b)(var|function|method|class|const|let|external|internal|protected|use|namespace|public|private)(\b)/g, '$1$2$3') .replace(/(^|\b)(and|array|break|case|die|do|echo|s?printf?|else(if)?|elsif|final|for(each|Each)?|map|try|catch|then|global|if|include(_once)?|length|list|map|new|or|require(_once)?|return|self|switch|this|throw|while)(\b)/g, '$1$2$3') .replace(/([$@%][a-zA-Z0-9_]+)/g, '$1') .replace(/([^a-zA-Z$#\d])(-?\d[\d.]*)/g, '$1$2') @@ -464,12 +464,12 @@ var markyMark = function(string, rules) { }) .replace(/(]+src="[^"]+-(\d+)x(\d+)\.[^"]+")/g, '$1 width="$2" height="$3"') .replace(/(<)img([^>]src="[^"]+\.(mp[234g]|webm|og[gamv])(?:#[^"]*)?"+[^>]*?)\s*\/?>/, function(all, first, last, suffix) { - var tag = suffix.match(/^(?:mp[24g]|webm|og[gmv])$/) ? 'video' : 'audio'; + let tag = suffix.match(/^(?:mp[24g]|webm|og[gmv])$/) ? 'video' : 'audio'; all = first + tag + last + ' controls="controls">'; return all.replace(/\salt="([^"]*)"([^>]*>)/, '$2$1'); }) .replace(/(]+alt=")(?:>\s?)([^"]+)("[^>]*>)/g, function(all, first, alt, last) { - var img = '' + first + alt + last + '' + alt + ''; + let img = '' + first + alt + last + '' + alt + ''; return img.replace(/(class="figure)(".+]+src="[^"]+#)([^"]+)(")/, '$1 $3$2$3$4'); }) .replace(/(<(?:img|hr|br)[^>]*[^/])(>)/g, '$1 /$2') diff --git a/src/helpers/post-url.js b/src/helpers/post-url.js index 55e025ec..4020e4a1 100644 --- a/src/helpers/post-url.js +++ b/src/helpers/post-url.js @@ -1,7 +1,7 @@ 'use strict'; -var url = require('../helpers/url'); -var SuperString = require('../helpers/super-string'); +const url = require('../helpers/url'); +const SuperString = require('../helpers/super-string'); /** * [postUrl description] @@ -9,8 +9,8 @@ var SuperString = require('../helpers/super-string'); * @param {String} path [description] * @return {Object} [description] */ -var postUrl = function(identifier, path) { - var external = url(identifier); +const postUrl = function(identifier, path) { + const external = url(identifier); external.path = path || 'posts'; external.convert = function(base, type) { diff --git a/src/helpers/share-links.js b/src/helpers/share-links.js index ea13fc1b..fc7c12d8 100644 --- a/src/helpers/share-links.js +++ b/src/helpers/share-links.js @@ -9,7 +9,7 @@ * @param {String} image Optional: Absolute image url * @return {Object} [description] */ -var shareLinks = function(title, link, description, siteName, image) { +const shareLinks = function(title, link, description, siteName, image) { if (!link) { throw new Error('Missing required URL for share link'); } @@ -17,9 +17,9 @@ var shareLinks = function(title, link, description, siteName, image) { description = description || title; siteName = siteName || title; - var urlParameter = function(paramObject) { - var param = []; - for (var key in paramObject) { + let urlParameter = function(paramObject) { + let param = []; + for (let key in paramObject) { param.push(key + '=' + encodeURIComponent(paramObject[key])); } return param.join('&'); diff --git a/src/helpers/super-string.js b/src/helpers/super-string.js index d5a0bd1a..92268288 100644 --- a/src/helpers/super-string.js +++ b/src/helpers/super-string.js @@ -5,8 +5,8 @@ * @param {String} string [description] * @return {url} [description] */ -var SuperString = function(string) { - var external = {}; +const SuperString = function(string) { + const external = {}; external.string = String(string); /** @@ -15,7 +15,7 @@ var SuperString = function(string) { * @return {String} [description] */ external.sprintf = function() { - var i; + let i; if (arguments) { for (i = 0; i < arguments.length; ++i) { switch (external.string.match(/%([sdfF])/)[1]) { @@ -87,7 +87,7 @@ var SuperString = function(string) { * @return {Object} E.g. `{a:'b',c:'d'}` */ external.paramsToObject = function(splitter) { - var obj = {}, parts, i, currItem; + let obj = {}, parts, i, currItem; splitter = splitter ? splitter : /&/; parts = external.string.replace(/^\?/, '').split(splitter); for (i=0; i < parts.length; i++) { diff --git a/src/helpers/tag-url.js b/src/helpers/tag-url.js index 2feaae2d..ab39e164 100644 --- a/src/helpers/tag-url.js +++ b/src/helpers/tag-url.js @@ -1,7 +1,7 @@ 'use strict'; -var url = require('../helpers/url'); -var SuperString = require('../helpers/super-string'); +const url = require('../helpers/url'); +const SuperString = require('../helpers/super-string'); /** * [tagUrl description] @@ -9,8 +9,8 @@ var SuperString = require('../helpers/super-string'); * @param {String} path [description] * @return {Object} [description] */ -var tagUrl = function(identifier, path) { - var external = url(identifier); +const tagUrl = function(identifier, path) { + const external = url(identifier); external.path = path || 'tagged'; external.convert = function(base, type) { diff --git a/src/helpers/translations.js b/src/helpers/translations.js index 3bf5f001..38e89683 100644 --- a/src/helpers/translations.js +++ b/src/helpers/translations.js @@ -6,9 +6,9 @@ * @param {String} language [description] * @return {Object} [description] */ -var translations = function(language) { +const translations = function(language) { // TODO: Move languages to separate files - var external = {}; + const external = {}; external.translations = { de: { 'Home': 'Startseite', diff --git a/src/helpers/url.js b/src/helpers/url.js index c3dd3481..d75aab2b 100644 --- a/src/helpers/url.js +++ b/src/helpers/url.js @@ -1,8 +1,8 @@ 'use strict'; -var path = require('path'); -var SuperString = require('../helpers/super-string'); -var config = require('../config'); +const path = require('path'); +const SuperString = require('../helpers/super-string'); +const config = require('../config'); /** * [url description] @@ -10,8 +10,8 @@ var config = require('../config'); * @param {String} identifier [description] * @return {url} [description] */ -var url = function(identifier) { - var external = {}; +const url = function(identifier) { + const external = {}; external.identifier = identifier ? identifier.replace(/^\/+/, '') : null; @@ -34,7 +34,7 @@ var url = function(identifier) { * @return {String} [description] */ external.relativeUrl = function(base, type) { - var url = external.convert(base, type); + let url = external.convert(base, type); return !url ? null : config.basePath + url.replace(/\/index\.html$/, '/'); }; @@ -45,7 +45,7 @@ var url = function(identifier) { * @return {String} [description] */ external.absoluteUrl = function(base, type) { - var url = external.relativeUrl(base, type); + let url = external.relativeUrl(base, type); return !url ? null : config.baseUrl + url; }; @@ -54,7 +54,7 @@ var url = function(identifier) { * @return {String} [description] */ external.absoluteUrlDirname = function() { - var url = external.absoluteUrl(); + let url = external.absoluteUrl(); return !url ? null : path.dirname(url + '-'); }; @@ -65,7 +65,7 @@ var url = function(identifier) { * @return {String} [description] */ external.filename = function(base, type) { - var url = external.relativeFilename(base, type); + let url = external.relativeFilename(base, type); return !url ? null : path.join(config.directories.htdocs, url); }; @@ -74,7 +74,7 @@ var url = function(identifier) { * @return {String} [description] */ external.dirname = function() { - var url = external.filename(); + let url = external.filename(); return !url ? null : path.dirname(url); }; @@ -85,7 +85,7 @@ var url = function(identifier) { * @return {[type]} [description] */ external.relativeFilename = function(base, type) { - var url = external.convert(base, type); + let url = external.convert(base, type); return !url ? null : url.replace(/(\/)$/, '$1index.html'); }; @@ -96,7 +96,7 @@ var url = function(identifier) { * @return {[type]} [description] */ external.relativeDirname = function(base, type) { - var url = external.relativeFilename(base, type); + let url = external.relativeFilename(base, type); return !url ? null : path.dirname(url); }; diff --git a/src/models/apple-news-format.js b/src/models/apple-news-format.js index b72e8d5f..ac1b392b 100644 --- a/src/models/apple-news-format.js +++ b/src/models/apple-news-format.js @@ -6,7 +6,7 @@ * @param {Object} post [description] * @return {Object} [description] */ -var appleNewsFormat = function(post) { +const appleNewsFormat = function(post) { return { version: 1.2, identifier: post.meta.AbsoluteUrl, diff --git a/src/models/blogophon-date.js b/src/models/blogophon-date.js index ea21499a..fc0f914c 100644 --- a/src/models/blogophon-date.js +++ b/src/models/blogophon-date.js @@ -1,6 +1,6 @@ 'use strict'; -var dateFormat = require('dateformat'); +const dateFormat = require('dateformat'); /** * Returns lots of date formats as a javascript object. @@ -10,11 +10,11 @@ var dateFormat = require('dateformat'); * @param {String} locale [description] * @return {Object} [description] */ -var blogophonDate = function(date, locale) { +const blogophonDate = function(date, locale) { if (!locale) { locale = 'de'; } - var localeString = 'dd.mm.yyyy'; + let localeString = 'dd.mm.yyyy'; switch (locale) { case 'de': case 'ru': diff --git a/src/models/geo-json.js b/src/models/geo-json.js index e30ec883..264af01d 100644 --- a/src/models/geo-json.js +++ b/src/models/geo-json.js @@ -7,11 +7,11 @@ * @param {Array} index [description] * @return {Object} [description] */ -var geoJson = function(index) { +const geoJson = function(index) { return { type: 'FeatureCollection', features: index.map(function(item){ - var tags = []; + let tags = []; if (item.meta.Tags) { tags = item.meta.Tags.map(function(t){ return t.title; diff --git a/src/models/hashes.js b/src/models/hashes.js index 19beed42..6f4d3446 100644 --- a/src/models/hashes.js +++ b/src/models/hashes.js @@ -1,7 +1,7 @@ 'use strict'; -var fs = require('fs'); -var path = require('path'); +const fs = require('fs'); +const path = require('path'); /** * Represents all list of item hashes. This may be useful to determine if a item has been altered. @@ -9,13 +9,13 @@ var path = require('path'); * @param {String} hashFilename Defaults to project default * @constructor */ -var hashes = function(hashFilename) { +const hashes = function(hashFilename) { hashFilename = hashFilename || path.join(process.cwd(), 'user/hashes.json'); - var external = {}; + const external = {}; - var hashes = {}; - var updatedHashes = {}; + let hashes = {}; + let updatedHashes = {}; try { hashes = JSON.parse(fs.readFileSync(hashFilename, 'utf8')); } catch (e) { diff --git a/src/models/json-feed.js b/src/models/json-feed.js index 59bd35d1..c2eaa5ca 100644 --- a/src/models/json-feed.js +++ b/src/models/json-feed.js @@ -10,7 +10,7 @@ * @param {String} feedUrl [description] * @return {Object} [description] */ -var jsonFeed = function(index, pubDate, config, title, feedUrl) { +const jsonFeed = function(index, pubDate, config, title, feedUrl) { return { version: "https://jsonfeed.org/version/1", title: (config.name || '') + (title ? ' | ' + title : ''), @@ -27,7 +27,7 @@ var jsonFeed = function(index, pubDate, config, title, feedUrl) { language: config.locale.language }, items: index.map(function(post){ - var returnPost = { + let returnPost = { id: post.meta.Id || post.meta.AbsoluteUrl, url: post.meta.AbsoluteUrl, title: post.meta.Title, diff --git a/src/models/json-rss.js b/src/models/json-rss.js index 08752bd2..485985cd 100644 --- a/src/models/json-rss.js +++ b/src/models/json-rss.js @@ -10,7 +10,7 @@ * @param {String} feedUrl [description] * @return {Object} [description] */ -var jsonRss = function(index, pubDate, config, title, feedUrl) { +const jsonRss = function(index, pubDate, config, title, feedUrl) { return { version: "2.0", channel: { @@ -26,7 +26,7 @@ var jsonRss = function(index, pubDate, config, title, feedUrl) { lastBuildDate: pubDate.rfc, lastBuildDateTs: pubDate.timestamp, items: index.map(function(item){ - var returnItem = { + let returnItem = { title: item.meta.Title, description: item.safeHtmlTeaser || item.htmlTeaser, contentEncoded: item.safeHtml || item.html, diff --git a/src/models/manifest.js b/src/models/manifest.js index 29a8ee33..70f7dd76 100644 --- a/src/models/manifest.js +++ b/src/models/manifest.js @@ -6,7 +6,7 @@ * @param {Object} config [description] * @return {Object} [description] */ -var manifest = function(config) { +const manifest = function(config) { return { lang: config.locale.language, name: config.name || '', diff --git a/src/models/post.js b/src/models/post.js index 41ad79ff..157edb4e 100644 --- a/src/models/post.js +++ b/src/models/post.js @@ -1,17 +1,17 @@ 'use strict'; -var markdownConvert = require('8fold-marked'); -var crypto = require('crypto'); -var SuperString = require('../helpers/super-string'); -var markyMark = require('../helpers/marky-mark'); -var ampify = require('../helpers/ampify')(); -var postUrl = require('../helpers/post-url'); -var tagUrl = require('../helpers/tag-url'); -var authorUrl = require('../helpers/author-url'); -var shareLinks = require('../helpers/share-links'); -var blogophonDate = require('../models/blogophon-date'); -var imageStyles = require('../helpers/image-styles'); -var removeMarkdown = require('remove-markdown'); +const markdownConvert = require('8fold-marked'); +const crypto = require('crypto'); +const SuperString = require('../helpers/super-string'); +const markyMark = require('../helpers/marky-mark'); +const ampify = require('../helpers/ampify')(); +const postUrl = require('../helpers/post-url'); +const tagUrl = require('../helpers/tag-url'); +const authorUrl = require('../helpers/author-url'); +const shareLinks = require('../helpers/share-links'); +const blogophonDate = require('../models/blogophon-date'); +const imageStyles = require('../helpers/image-styles'); +const removeMarkdown = require('remove-markdown'); /** * This class holds Markdown and converts it into a proper post. @@ -21,10 +21,10 @@ var removeMarkdown = require('remove-markdown'); * @param {Object} meta [description] * @param {Object} config [description] */ -var Post = function(filename, markdown, meta, config) { +const Post = function(filename, markdown, meta, config) { config = config || require('../config'); - var external = {}; - var internal = {}; + const external = {}; + const internal = {}; /** * Convert input data into final object @@ -77,7 +77,7 @@ var Post = function(filename, markdown, meta, config) { meta.Modified = meta.Created; } - var path = config.htdocs.posts; + let path = config.htdocs.posts; if (config.postPathMode){ switch (config.postPathMode) { case 'Year': @@ -119,7 +119,7 @@ var Post = function(filename, markdown, meta, config) { if (meta.Keywords) { meta.Keywords = internal.listToArray(meta.Keywords); meta.Tags = meta.Keywords.map(function(tag){ - var tagUrlObj = tagUrl(tag, config.htdocs.tag); + let tagUrlObj = tagUrl(tag, config.htdocs.tag); return { title: tag, id: SuperString(tag).asciify(), @@ -149,7 +149,7 @@ var Post = function(filename, markdown, meta, config) { if (!meta.Author) { meta.Author = config.defaultAuthor.name + ' <' + config.defaultAuthor.email + '>'; } - var metaAuthor = meta.Author.match(/^(.+?)(?:\s<(.+)>)?$/); + let metaAuthor = meta.Author.match(/^(.+?)(?:\s<(.+)>)?$/); if (metaAuthor) { meta.AuthorName = metaAuthor[1]; meta.AuthorEmail = metaAuthor[2] ? metaAuthor[2].trim() : config.defaultAuthor.email; @@ -157,7 +157,7 @@ var Post = function(filename, markdown, meta, config) { } meta.authorUrlObj = authorUrl(meta.AuthorName, config.htdocs.author); if (!meta.Image) { - var match = external.html.match(/<(?:!-- )?img.+?src="(.+?)"/); + let match = external.html.match(/<(?:!-- )?img.+?src="(.+?)"/); if (match) { meta.Image = match[1]; } @@ -177,7 +177,7 @@ var Post = function(filename, markdown, meta, config) { meta.Twitter = meta.Twitter.replace(/\\(#)/g, '$1'); } if (meta.Rating) { - var match2 = meta.Rating.match(/^(\d)\/(\d)$/); + let match2 = meta.Rating.match(/^(\d)\/(\d)$/); if (match2) { meta.RatingObj = { worst: 1, @@ -221,7 +221,7 @@ var Post = function(filename, markdown, meta, config) { * @return {String} [description] */ internal.markyMark = function(markdown, relUrl) { - var html = markyMark(markdownConvert(markdown), {language: config.locale.language}).toString(); + let html = markyMark(markdownConvert(markdown), {language: config.locale.language}).toString(); if (relUrl) { html = html.replace(/(]+src=")([^:"]+?")/g, '$1'+relUrl+'$2'); } @@ -248,7 +248,7 @@ var Post = function(filename, markdown, meta, config) { internal.galleryHtml = function(html) { return html .replace(/

(\s*(?:]+>\s*){2,})<\/p>/g, function(all, content) { - var count = content.match(/)/g, '

$1
'+"\n"); return '
' + "\n" + content + '
'; }) @@ -300,7 +300,7 @@ var Post = function(filename, markdown, meta, config) { * @return {Object} [description] */ external.toJSON = function() { - var json = external; + let json = external; if (json.next && json.next.Id) { json.next = json.next.urlObj.relativeUrl('index', 'json'); } @@ -315,9 +315,9 @@ var Post = function(filename, markdown, meta, config) { * @return {Array} of {filename, style} */ external.getAllImagesWithStyle = function() { - var singleImage; - var allMarkdown = external.meta.MarkdownDescription + "\n" + markdown; - var all = allMarkdown.match(/!\[.*?\]\(([^\s/]+?)(?:#(\S+))?\)/g) || []; + let singleImage; + let allMarkdown = external.meta.MarkdownDescription + "\n" + markdown; + let all = allMarkdown.match(/!\[.*?\]\(([^\s/]+?)(?:#(\S+))?\)/g) || []; return all.map(function(i) { singleImage = i.match(/!\[.*?\]\(([^\s/]+?)(?:#(\S+))?\)/); if (singleImage[2] && singleImage[2].match(/^\d+x\d+$/)) { @@ -331,8 +331,8 @@ var Post = function(filename, markdown, meta, config) { }; external.getAllImagesWithStyleObject = function() { - var styles = external.getAllImagesWithStyle(); - var returnObject = {}; + let styles = external.getAllImagesWithStyle(); + let returnObject = {}; styles.forEach(function(s) { if (s.style) { if (!returnObject[s.filename]) { @@ -351,9 +351,9 @@ var Post = function(filename, markdown, meta, config) { * @return {Array} [description] */ external.getAllExternalLinks = function() { - var search = /]+href="(http[^"]+)"/g; - var matched; - var externalLinks = []; + let search = /]+href="(http[^"]+)"/g; + let matched; + let externalLinks = []; while ((matched = search.exec(external.html)) !== null) { externalLinks.push(matched[1]); } diff --git a/src/models/slacked.js b/src/models/slacked.js index 6d8847cb..c04357e0 100644 --- a/src/models/slacked.js +++ b/src/models/slacked.js @@ -10,7 +10,7 @@ * @param {String} title [description] * @return {Object} [description] */ -var slacked = function(index, pubDate, config, title) { +const slacked = function(index, pubDate, config, title) { return { "response_type": "ephemeral", "text": (config.name || '') + (title ? ' | ' + title : ''), diff --git a/src/post-reader.js b/src/post-reader.js index 4b979d17..e77750cb 100644 --- a/src/post-reader.js +++ b/src/post-reader.js @@ -1,10 +1,10 @@ 'use strict'; -var Promise = require('promise/lib/es6-extensions'); -var fs = require('fs'); -var readline = require('readline'); -var yaml = require('js-yaml'); -var post = require('./models/post'); +const Promise = require('promise/lib/es6-extensions'); +const fs = require('fs'); +const readline = require('readline'); +const yaml = require('js-yaml'); +const post = require('./models/post'); /** * This class reads Markdown files into an object. @@ -12,19 +12,19 @@ var post = require('./models/post'); * @param {String} file [description] * @param {Object} config [description] */ -var PostReader = function(file, config) { +const PostReader = function(file, config) { config = config || require('./config'); if (!file) { throw new Error('File '+file+' is empty'); } - var readYaml = true; - var lineNumber = 0; - var yamlBuffer = ''; - var descriptionBuffer = ''; - var startDescriptionBuffer = false; - var fileStat; - var postData = { + let readYaml = true; + let lineNumber = 0; + let yamlBuffer = ''; + let descriptionBuffer = ''; + let startDescriptionBuffer = false; + let fileStat; + let postData = { meta: {}, markdown: '' }; diff --git a/src/setup.js b/src/setup.js index a37b160a..75c56122 100644 --- a/src/setup.js +++ b/src/setup.js @@ -1,13 +1,13 @@ 'use strict'; -var Mustache = require('./helpers/blogophon-mustache'); -var fs = require('fs-extra-promise'); -var path = require('path'); -var Promise = require('promise/lib/es6-extensions'); +const Mustache = require('./helpers/blogophon-mustache'); +const fs = require('fs-extra-promise'); +const path = require('path'); +const Promise = require('promise/lib/es6-extensions'); -var setup = function() { +const setup = function() { Mustache.getTemplates(); - var external = {}; + const external = {}; /** * Writes static files which will only be needed anew when the blog gets a new URL @@ -16,12 +16,12 @@ var setup = function() { * @return {Promise} [description] */ external.buildBasicFiles = function(config, answers) { - var manifest = require('./models/manifest'); + let manifest = require('./models/manifest'); fs.ensureDirSync(config.directories.data); fs.ensureDirSync(config.directories.htdocs); - var promises = [ + let promises = [ fs.writeFileAsync( path.join(config.directories.user, 'config.json'), JSON.stringify(answers, undefined, 2)), @@ -55,10 +55,10 @@ var setup = function() { ]; return Promise .all(promises) - .then(function() { + .then(() => { console.log("Wrote " + promises.length + " basic files"); }) - .catch(function(err) { + .catch((err) => { console.error(err); }) ; diff --git a/test/ampify.js b/test/ampify.js index 23703ef7..3183e5f6 100644 --- a/test/ampify.js +++ b/test/ampify.js @@ -1,11 +1,11 @@ 'use strict'; -var ampify = require('../src/helpers/ampify')(); +const ampify = require('../src/helpers/ampify')(); exports.testAmpifyBasic = function testAmpifyBasic(test) { test.expect(1); - var html = ''; + const html = ''; test.equal(ampify.ampifyHtml(html), ''); test.done(); @@ -14,20 +14,20 @@ exports.testAmpifyBasic = function testAmpifyBasic(test) { exports.testAmpifyVideo = function testAmpifyBasic(test) { test.expect(3+6); - var html = '
'; + let html = '
'; html += "\n"; html += '
'; html += "\n"; html += '
Before iFrame 1 behin iFrame 1
'; html += '
Before iFrame 2 behind iFrame 2
'; - var ampHtml = ampify.ampifyHtml(html); + let ampHtml = ampify.ampifyHtml(html); //console.log(ampHtml); test.ok(ampHtml.match(/'); test.ok(html, 'replaceImgHtml is returning something'); diff --git a/test/json-feed.js b/test/json-feed.js index 41f8e3cc..e55cdd5b 100644 --- a/test/json-feed.js +++ b/test/json-feed.js @@ -1,14 +1,14 @@ 'use strict'; -var blogophonDate = require('../src/models/blogophon-date'); +const blogophonDate = require('../src/models/blogophon-date'); exports.testBasicProperties = function(test) { test.expect(11); - var config = require('../src/config'); - var pubDate = blogophonDate('2016-12-31', 'en'); + const config = require('../src/config'); + const pubDate = blogophonDate('2016-12-31', 'en'); - var item = { + const item = { htmlTeaser: 1, html: 33, meta: { @@ -21,7 +21,7 @@ exports.testBasicProperties = function(test) { Language: 'en' } }; - var jsonFeed = require('../src/models/json-feed')([item], pubDate, config, 'title', 'url'); + const jsonFeed = require('../src/models/json-feed')([item], pubDate, config, 'title', 'url'); //console.log(jsonFeed); diff --git a/test/json-rss.js b/test/json-rss.js index 7cc420df..77307efd 100644 --- a/test/json-rss.js +++ b/test/json-rss.js @@ -1,14 +1,14 @@ 'use strict'; -var blogophonDate = require('../src/models/blogophon-date'); +const blogophonDate = require('../src/models/blogophon-date'); exports.testBasicProperties = function(test) { test.expect(14); - var config = require('../src/config'); - var pubDate = blogophonDate('2016-12-31', 'en'); + const config = require('../src/config'); + const pubDate = blogophonDate('2016-12-31', 'en'); - var item = { + const item = { htmlTeaser: 1, meta: { AbsoluteUrl: 2, @@ -20,7 +20,7 @@ exports.testBasicProperties = function(test) { tags: [6, 7] } }; - var jsonRss = require('../src/models/json-rss')([item], pubDate, config); + const jsonRss = require('../src/models/json-rss')([item], pubDate, config); test.ok(jsonRss.version !== undefined); test.ok(jsonRss.channel !== undefined); diff --git a/test/manifest.js b/test/manifest.js index 3f4bdd10..e3278ff2 100644 --- a/test/manifest.js +++ b/test/manifest.js @@ -3,8 +3,8 @@ exports.testBasicProperties = function(test) { test.expect(5); - var config = require('../src/config'); - var manifest = require('../src/models/manifest')(config); + const config = require('../src/config'); + const manifest = require('../src/models/manifest')(config); // console.log(manifest); diff --git a/test/marky-mark.js b/test/marky-mark.js index 9eb21019..fe58e383 100644 --- a/test/marky-mark.js +++ b/test/marky-mark.js @@ -1,11 +1,11 @@ 'use strict'; -var markyMark = require('../src/helpers/marky-mark'); +const markyMark = require('../src/helpers/marky-mark'); exports.testSimpleString = function(test) { test.expect(14); - var m; + let m; m = markyMark('

Test 12x24 - "Test"

'); test.ok(m.match(/Test 12/)); @@ -47,7 +47,7 @@ exports.testSimpleString = function(test) { exports.testCodeHighlighting = function(test) { test.expect(6); - var m; + let m; m = markyMark('

Mein Anwendungsfall: Ich warte auf eine bestimmte Anzahl von Events, und löse mein eigenes Event aus, wenn alle meine Sub-Events erfolgreich abgeschlossen haben. Bisher sah das so aus (schon mit der Kraft von Array.forEach):

  var files = [\'a.txt\',\'b.txt\',\'c.txt\'];  /*var processed = 0;*/  var checkProcessed  = function(err) {    if (err) {      console.log("Error!");    }    if (++processed === files.length) {      console.log("Done!");    }  };  files.forEach(function(file) {    fs.writeFile(file, "Test test test", checkProcessed);  }); // Comment
'); test.ok(m !== undefined, 'String is not undefined'); @@ -77,7 +77,7 @@ exports.testDiffing = function(test) { test.expect(3); - var m; + let m; m = markyMark( '
'+
@@ -102,7 +102,7 @@ exports.testShell = function(test) {
 
   test.expect(3);
 
-  var m;
+  let m;
 
   m = markyMark(
     '
'+
@@ -127,7 +127,7 @@ exports.testShell = function(test) {
 exports.testQuotation = function(test) {
   test.expect(6);
 
-  var m, x = '
Delete me
Downgrade me
"Ah, there you are. As you said: \'Quotation is important\'".
';
+  let m, x = '
Delete me
Downgrade me
"Ah, there you are. As you said: \'Quotation is important\'".
';
 
   m = markyMark(x, {
     quotation: {
@@ -165,7 +165,7 @@ exports.testPhp = function(test) {
 
   test.expect(5);
 
-  var m, x = '              
Autoloading ist in PHP eine feine Sache. Statt jede einzelne Klasse mittels eigenem require_once einzubinden, kann man bei existierendem Autoloader einfach durch Aufruf der Klasse diese Laden.
'+"\n"+
+  let m, x = '              
Autoloading ist in PHP eine feine Sache. Statt jede einzelne Klasse mittels eigenem require_once einzubinden, kann man bei existierendem Autoloader einfach durch Aufruf der Klasse diese Laden.
'+"\n"+
   ''+"\n"+
   '
Eine Klasse legt man dabei einfach in einer Verzeichnisstruktur ab, z.B. unter Example/Foo.php. Das Innere der Datei sieht dann wie folgt aus:
'+"\n"+
   '
namespace Example;'+"\n"+
@@ -199,7 +199,7 @@ exports.testPhp = function(test) {
 
 exports.testBash = function(test) {
   test.expect(6);
-  var m, x = '
#!/bin/bash\nset -e\ncd `dirname $0`/..\nif [ ! -e build/config.sh ]; then\n  cp build/_config.sh build/config.sh\nfi\nsource build/config.sh\n\nif [ "$LOCAL_DB_HOST" ]; then\n  mysql -h $LOCAL_DB_HOST -u root -proot --execute "CREATE DATABASE IF NOT EXISTS $LOCAL_DB_DB"\n  mysql -h $LOCAL_DB_HOST -u root -proot --execute "GRANT ALL ON $LOCAL_DB_DB.* TO \'$LOCAL_DB_USR\'@\'localhost\' IDENTIFIED BY \'$LOCAL_DB_PWD\'"\nfi\nif [ -f build/mysql/dbdump.sql ]; then\n  build/import-dbdump.sh\nfi\n\nif [ -x "/usr/sbin/sestatus" ]; then\n  echo ""\n  echo -e "=== \\x1B[32mDirectory access\\x1B[m ==="\n  echo ""\nfi\n\nfunction make_writable_directory {\n  mkdir -p $1 && chmod -R ugo+rwX $1\n  if [ -x "/usr/sbin/sestatus" ]; then\n    echo "semanage fcontext -a -t httpd_sys_rw_content_t "$LOCAL_DIRECTORY/$1(/.*)?""\n  fi\n}\n\n# mkdir -p tmp\n# make_writable_directory htdocs/files\n#[ -h TARGET ] || ln -s SOURCE TARGET\n#[ -f TARGET ] || cp SOURCE TARGET\n\nif [ ! -d /vagrant ]; then\n  echo ""\n  echo -e "=== \\x1B[32mApache2 vhost config\\x1B[m ==="\n  echo ""\n  sed "s#/var/www#$LOCAL_DIRECTORY#g" build/apache/macro-broilerplate.conf\n  sed "s#/var/www#$LOCAL_DIRECTORY#g;s#localhost#$LOCAL_HOST#g" build/apache/httpd-vhost.conf\n  echo ""\n  echo -e "=== \\x1B[32m/etc/hosts\\x1B[m === "\n  echo ""\n  echo "127.0.0.1    $LOCAL_HOST"\n  echo ""\n  [ -d node_modules ] || npm install\nelse\n  [ -d node_modules ] || sudo npm install --no-bin-links\nfi
';
+  let m, x = '
#!/bin/bash\nset -e\ncd `dirname $0`/..\nif [ ! -e build/config.sh ]; then\n  cp build/_config.sh build/config.sh\nfi\nsource build/config.sh\n\nif [ "$LOCAL_DB_HOST" ]; then\n  mysql -h $LOCAL_DB_HOST -u root -proot --execute "CREATE DATABASE IF NOT EXISTS $LOCAL_DB_DB"\n  mysql -h $LOCAL_DB_HOST -u root -proot --execute "GRANT ALL ON $LOCAL_DB_DB.* TO \'$LOCAL_DB_USR\'@\'localhost\' IDENTIFIED BY \'$LOCAL_DB_PWD\'"\nfi\nif [ -f build/mysql/dbdump.sql ]; then\n  build/import-dbdump.sh\nfi\n\nif [ -x "/usr/sbin/sestatus" ]; then\n  echo ""\n  echo -e "=== \\x1B[32mDirectory access\\x1B[m ==="\n  echo ""\nfi\n\nfunction make_writable_directory {\n  mkdir -p $1 && chmod -R ugo+rwX $1\n  if [ -x "/usr/sbin/sestatus" ]; then\n    echo "semanage fcontext -a -t httpd_sys_rw_content_t "$LOCAL_DIRECTORY/$1(/.*)?""\n  fi\n}\n\n# mkdir -p tmp\n# make_writable_directory htdocs/files\n#[ -h TARGET ] || ln -s SOURCE TARGET\n#[ -f TARGET ] || cp SOURCE TARGET\n\nif [ ! -d /vagrant ]; then\n  echo ""\n  echo -e "=== \\x1B[32mApache2 vhost config\\x1B[m ==="\n  echo ""\n  sed "s#/var/www#$LOCAL_DIRECTORY#g" build/apache/macro-broilerplate.conf\n  sed "s#/var/www#$LOCAL_DIRECTORY#g;s#localhost#$LOCAL_HOST#g" build/apache/httpd-vhost.conf\n  echo ""\n  echo -e "=== \\x1B[32m/etc/hosts\\x1B[m === "\n  echo ""\n  echo "127.0.0.1    $LOCAL_HOST"\n  echo ""\n  [ -d node_modules ] || npm install\nelse\n  [ -d node_modules ] || sudo npm install --no-bin-links\nfi
';
 
   m = markyMark(x);
   //console.log(m);
@@ -220,7 +220,7 @@ exports.testBash = function(test) {
 
 exports.testTable = function(test) {
   test.expect(4);
-  var m, x = '
ModelPathfinderHaulerDiamondback Scout
ManufacturerZorgon PetersonZorgon PetersonLakon Spaceways
TypeLight ExplorerLight FreighterLight Combat Explorer
Cost~460,000 CR52,720 Cr564,320 Cr
Top Speed230 m/s200 m/s280 m/s
Boost Speed340 m/s300 m/s380 m/s
Manoeuvrability868
Hull Mass45 t14 t170 t
Max. Cargo Capacity20 t22 t28 t
Max. Jump Range38 Ly37 Ly30 Ly
Landing Pad SizeSmallSmallSmall
Power Plant224
Thrusters324
Frame Shift Drive324
Life Support112
Power Distributor112
Sensors213
Fuel Tank224
Hardpoints Medium--2x
Hardpoints Small2x1x2x
Utility Mounts1x2x4x
Size 3 Compartments1x2x3x
Size 2 Compartments2x1x1x
Size 1 Compartments2x1x-
';
+  let m, x = '
ModelPathfinderHaulerDiamondback Scout
ManufacturerZorgon PetersonZorgon PetersonLakon Spaceways
TypeLight ExplorerLight FreighterLight Combat Explorer
Cost~460,000 CR52,720 Cr564,320 Cr
Top Speed230 m/s200 m/s280 m/s
Boost Speed340 m/s300 m/s380 m/s
Manoeuvrability868
Hull Mass45 t14 t170 t
Max. Cargo Capacity20 t22 t28 t
Max. Jump Range38 Ly37 Ly30 Ly
Landing Pad SizeSmallSmallSmall
Power Plant224
Thrusters324
Frame Shift Drive324
Life Support112
Power Distributor112
Sensors213
Fuel Tank224
Hardpoints Medium--2x
Hardpoints Small2x1x2x
Utility Mounts1x2x4x
Size 3 Compartments1x2x3x
Size 2 Compartments2x1x1x
Size 1 Compartments2x1x-
';
   m = markyMark(x);
   //console.log(m);
   test.ok(m, 'Got output');
@@ -234,7 +234,7 @@ exports.testTable = function(test) {
 exports.testMultimediaTags = function(test) {
   test.expect(22);
 
-  var m;
+  let m;
 
   m = markyMark('Description');
   test.ok(m.match(/
';
@@ -296,7 +296,7 @@ exports.testCss = function(test) {
 exports.testEmoji = function(test) {
   test.expect(2);
 
-  var m, x = ':) and ;) and \\o/ ';
+  let m, x = ':) and ;) and \\o/ ';
   m = markyMark(x);
 
   test.ok(m, 'Got output');
diff --git a/test/post-reader.js b/test/post-reader.js
index bd8950c8..61e9a65d 100644
--- a/test/post-reader.js
+++ b/test/post-reader.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var PostReader = require('../src/post-reader');
+const PostReader = require('../src/post-reader');
 
 exports.testErrors = function(test) {
   test.expect(7);
diff --git a/test/post.js b/test/post.js
index f52fb683..ce32bddf 100644
--- a/test/post.js
+++ b/test/post.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var post = require('../src/models/post');
-var config = require('../src/config');
+const post = require('../src/models/post');
+const config = require('../src/config');
 
 exports.testErrors = function(test) {
   test.expect(5);
@@ -32,7 +32,7 @@ exports.testErrors = function(test) {
 exports.testStructure = function(test) {
   test.expect(21);
 
-  var testPost = post('test.md', 'Test', {
+  let testPost = post('test.md', 'Test', {
     Description: 'Description',
     Date: new Date()
   });
@@ -64,13 +64,13 @@ exports.testStructure = function(test) {
 exports.testReplacingMarkdown = function(test) {
   test.expect(10);
 
-  var testMarkdown = 'Text ![](some-image.jpg) and [some internal link](internal.md).';
-  var testMarkdownDescription = 'Description ![](some-image.jpg) and [some internal link](internal.md).';
-  var testMeta = {
+  let testMarkdown = 'Text ![](some-image.jpg) and [some internal link](internal.md).';
+  let testMarkdownDescription = 'Description ![](some-image.jpg) and [some internal link](internal.md).';
+  let testMeta = {
     Description: testMarkdownDescription,
     Date: new Date()
   };
-  var testPost = post('test.md', testMarkdown, testMeta);
+  let testPost = post('test.md', testMarkdown, testMeta);
 
   //console.log(testPost);
 
@@ -96,7 +96,7 @@ exports.testReplacingMarkdown = function(test) {
 exports.testImageParser = function(test) {
   test.expect(13);
 
-  var testPost = post('test.md', 'Single image with style: ![](markdown.jpg#default) - and without style: ![](markdown.jpg) - and remote image ![](http://www.example.com/remote.jpg)', {
+  let testPost = post('test.md', 'Single image with style: ![](markdown.jpg#default) - and without style: ![](markdown.jpg) - and remote image ![](http://www.example.com/remote.jpg)', {
     Description: 'Single image with style: ![](description.jpg#default) - and without style: ![](description.jpg)',
     Date: new Date()
   });
@@ -104,7 +104,7 @@ exports.testImageParser = function(test) {
   test.ok(testPost.markdown);
   test.ok(testPost.meta.MarkdownDescription);
 
-  var imageStyles = testPost.getAllImagesWithStyle();
+  let imageStyles = testPost.getAllImagesWithStyle();
   //console.log(imageStyles);
   test.equal(imageStyles[0].filename, 'description.jpg');
   test.equal(imageStyles[0].style,    'default');
@@ -127,9 +127,9 @@ exports.testImageParser = function(test) {
 exports.testGallery = function(test) {
   test.expect(4);
 
-  var filename = 'test.md';
-  var markdown;
-  var testPost;
+  let filename = 'test.md';
+  let markdown;
+  let testPost;
 
   markdown = '![alt1](img1-64x48.jpg)';
   testPost = post(filename, markdown, {
@@ -168,13 +168,13 @@ exports.testGallery = function(test) {
 exports.testLinks = function(test) {
   test.expect(3);
 
-  var markdown = 'www.1test.com will not be found'
+  let markdown = 'www.1test.com will not be found'
     + 'But [this link](http://www.2test.com) will be found.'
     + 'As will be [this link](https://www.3test.com).'
     + 'An ![image](https://www.4test.com) should not be found.'
     + 'As will be [this link](https://www.5test.com/some-compilcated-foo?a#b).'
   ;
-  var testLinks = post('test.md', markdown, {
+  let testLinks = post('test.md', markdown, {
     Description: 'None',
     Date: new Date()
   }).getAllExternalLinks();
diff --git a/test/share-links.js b/test/share-links.js
index 49edd310..2d7d04c2 100644
--- a/test/share-links.js
+++ b/test/share-links.js
@@ -1,11 +1,11 @@
 'use strict';
 
-var shareLink = require('../src/helpers/share-links');
+const shareLink = require('../src/helpers/share-links');
 
 exports.testBasicProperties = function(test) {
   test.expect(5);
 
-  var share = shareLink(1, 2, 3, 4);
+  const share = shareLink(1, 2, 3, 4);
 
   test.ok(share.twitter);
   test.ok(share.facebook);
@@ -19,15 +19,15 @@ exports.testBasicProperties = function(test) {
 exports.testBasicProperties = function(test) {
   test.expect(19);
 
-  var testData = {
+  let testData = {
     title: 'Gollum',
     link: 'www.example.com',
     description: 'Mordor',
     siteName: 'MiddleEarth'
   };
-  var share = shareLink(testData.title, testData.link, testData.description, testData.siteName);
+  let share = shareLink(testData.title, testData.link, testData.description, testData.siteName);
 
-  var testMatch = {
+  let testMatch = {
     title: function(str) {
       return str.match(new RegExp(testData.title));
     },
diff --git a/test/slacked.js b/test/slacked.js
index 244ac128..770c4771 100644
--- a/test/slacked.js
+++ b/test/slacked.js
@@ -1,14 +1,14 @@
 'use strict';
 
-var blogophonDate = require('../src/models/blogophon-date');
+const blogophonDate = require('../src/models/blogophon-date');
 
 exports.testBasicProperties = function(test) {
   test.expect(7);
 
-  var config = require('../src/config');
-  var pubDate = blogophonDate('2016-12-31', 'en');
+  const config = require('../src/config');
+  const pubDate = blogophonDate('2016-12-31', 'en');
 
-  var item = {
+  const item = {
     htmlTeaser: 1,
     meta: {
       AbsoluteUrl: 2,
@@ -18,7 +18,7 @@ exports.testBasicProperties = function(test) {
       tags: [6, 7]
     }
   };
-  var slacked = require('../src/models/slacked')([item], pubDate, config);
+  const slacked = require('../src/models/slacked')([item], pubDate, config);
 
   //console.log(slacked);
 
diff --git a/test/translations.js b/test/translations.js
index e1014ccd..f8f35c27 100644
--- a/test/translations.js
+++ b/test/translations.js
@@ -3,7 +3,7 @@
 exports.testTranslations = function(test) {
   test.expect(3);
 
-  var translations = require('../src/helpers/translations');
+  const translations = require('../src/helpers/translations');
 
   test.throws(function() {
     translations('xx');
diff --git a/test/url.js b/test/url.js
index 7f8e17d7..2637cbae 100644
--- a/test/url.js
+++ b/test/url.js
@@ -1,16 +1,16 @@
 'use strict';
 
-var Url       = require('../src/helpers/url');
-var PostUrl   = require('../src/helpers/post-url');
-var AuthorUrl = require('../src/helpers/author-url');
-var TagUrl    = require('../src/helpers/tag-url');
-var IndexUrl  = require('../src/helpers/index-url');
+const Url       = require('../src/helpers/url');
+const PostUrl   = require('../src/helpers/post-url');
+const AuthorUrl = require('../src/helpers/author-url');
+const TagUrl    = require('../src/helpers/tag-url');
+const IndexUrl  = require('../src/helpers/index-url');
 
 
 exports.testExtender = function(test) {
   test.expect(8);
 
-  var url = Url('test');
+  let url = Url('test');
 
   test.ok(url.relativeUrl());
   test.ok(url.absoluteUrl());
@@ -34,7 +34,7 @@ exports.testExtender = function(test) {
 exports.testBasicTransformation = function(test) {
   test.expect(9+3);
 
-  var url;
+  let url;
 
   url = PostUrl('ich-und-du.md');
   test.ok(url.relativeUrl().match(/^\S*\/posts\/ich-und-du\/$/));
@@ -62,7 +62,7 @@ exports.testBasicTransformation = function(test) {
 exports.testSpecialTransformation = function(test) {
   test.expect(12);
 
-  var url;
+  let url;
 
   url = PostUrl('Ich-ünd-Dü.md');
   test.ok(url.relativeUrl().match(/^\S*\/posts\/ich-uend-due\/$/));