From 9b4d450034df98140c41f096ed36f13f4dc8e2e1 Mon Sep 17 00:00:00 2001 From: doowb Date: Mon, 19 Mar 2018 19:43:20 -0400 Subject: [PATCH] lint --- examples/express.js | 4 +- lib/consolidate.js | 257 +++++++++++++++++++--------------------- test/shared/dust.js | 4 +- test/shared/filters.js | 4 +- test/shared/helpers.js | 14 +-- test/shared/includes.js | 10 +- test/shared/index.js | 52 ++++---- test/shared/partials.js | 28 ++--- test/shared/react.js | 32 +++-- 9 files changed, 191 insertions(+), 214 deletions(-) diff --git a/examples/express.js b/examples/express.js index 64278e7..c74dad8 100644 --- a/examples/express.js +++ b/examples/express.js @@ -14,13 +14,13 @@ users.push({ name: 'tobi' }); users.push({ name: 'loki' }); users.push({ name: 'jane' }); -app.get('/', function(req, res){ +app.get('/', function(req, res) { res.render('index', { title: 'Consolidate.js' }); }); -app.get('/users', function(req, res){ +app.get('/users', function(req, res) { res.render('users', { title: 'Users', users: users diff --git a/lib/consolidate.js b/lib/consolidate.js index 937cc88..02325a9 100644 --- a/lib/consolidate.js +++ b/lib/consolidate.js @@ -44,7 +44,7 @@ var requires = {}; * @api public */ -exports.clearCache = function(){ +exports.clearCache = function() { readCache = {}; cacheStore = {}; }; @@ -93,7 +93,7 @@ function read(path, options, fn) { if (cached) return fn(null, str); // read - fs.readFile(path, 'utf8', function(err, str){ + fs.readFile(path, 'utf8', function(err, str) { if (err) return fn(err); // remove extraneous utf8 BOM marker str = str.replace(/^\uFEFF/, ''); @@ -137,7 +137,7 @@ function readPartials(path, options, fn) { file = join(dirname(path), partialPath + extname(path)); } - read(file, options, function(err, str){ + read(file, options, function(err, str) { if (err) return fn(err); options.partials[key] = str; next(++index); @@ -147,13 +147,12 @@ function readPartials(path, options, fn) { next(0); } - /** * promisify */ function promisify(fn, exec) { - return new Promise(function (res, rej) { - fn = fn || function (err, html) { + return new Promise(function(res, rej) { + fn = fn || function(err, html) { if (err) { return rej(err); } @@ -163,22 +162,21 @@ function promisify(fn, exec) { }); } - /** * fromStringRenderer */ function fromStringRenderer(name) { - return function(path, options, fn){ + return function(path, options, fn) { options.filename = path; return promisify(fn, function(fn) { - readPartials(path, options, function (err) { + readPartials(path, options, function(err) { if (err) return fn(err); if (cache(options)) { exports[name].render('', options, fn); } else { - read(path, options, function(err, str){ + read(path, options, function(err, str) { if (err) return fn(err); exports[name].render(str, options, fn); }); @@ -198,7 +196,7 @@ exports.velocityjs = fromStringRenderer('velocityjs'); * velocity string support. */ -exports.velocityjs.render = function(str, options, fn){ +exports.velocityjs.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.velocityjs || (requires.velocityjs = require('velocityjs')); try { @@ -266,11 +264,11 @@ function _renderTinyliquid(engine, str, options, fn) { var includeDir = options.includeDir || process.cwd(); - context.onInclude(function (name, callback) { + context.onInclude(function(name, callback) { var extname = path.extname(name) ? '' : '.liquid'; var filename = path.resolve(includeDir, name + extname); - fs.readFile(filename, {encoding: 'utf8'}, function (err, data) { + fs.readFile(filename, {encoding: 'utf8'}, function(err, data) { if (err) return callback(err); callback(null, engine.parse(data)); }); @@ -293,7 +291,7 @@ function _renderTinyliquid(engine, str, options, fn) { for (k in options.customTags) { /*Tell jshint there's no problem with having this function in the loop */ /*jshint -W083 */ - compileOptions.customTags[k] = function (context, name, body) { + compileOptions.customTags[k] = function(context, name, body) { var tpl = tagFunctions[name](body.trim()); context.astStack.push(engine.parse(tpl)); }; @@ -318,8 +316,8 @@ function _renderTinyliquid(engine, str, options, fn) { tmpl(context, fn); } -exports.liquid.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.liquid.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.liquid; var Liquid; @@ -348,7 +346,7 @@ exports.liquid.render = function(str, options, fn){ try { var locals = options.locals || {}; - if (options.meta){ + if (options.meta) { locals.pages = options.meta; delete options.meta; } @@ -376,10 +374,10 @@ exports.liquid.render = function(str, options, fn){ * callback: */ - if (options.customTags){ + if (options.customTags) { var tagFunctions = options.customTags; - for (k in options.customTags){ + for (k in options.customTags) { engine.registerTag(k, tagFunctions[k]); } delete options.customTags; @@ -389,7 +387,7 @@ exports.liquid.render = function(str, options, fn){ * Now anything left in `options` becomes a local: */ - for (var k in options){ + for (var k in options) { locals[k] = options[k]; } @@ -399,7 +397,7 @@ exports.liquid.render = function(str, options, fn){ return engine .parseAndRender(str, locals) - .nodeify(function (err, result) { + .nodeify(function(err, result) { if (err) { throw new Error(err); } else { @@ -417,8 +415,8 @@ exports.liquid.render = function(str, options, fn){ * Jade support. */ -exports.jade = function(path, options, fn){ - return promisify(fn, function (fn) { +exports.jade = function(path, options, fn) { + return promisify(fn, function(fn) { var engine = requires.jade; if (!engine) { try { @@ -445,8 +443,8 @@ exports.jade = function(path, options, fn){ * Jade string support. */ -exports.jade.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.jade.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.jade; if (!engine) { try { @@ -479,7 +477,7 @@ exports.dust = fromStringRenderer('dust'); * Dust string support. */ -exports.dust.render = function(str, options, fn){ +exports.dust.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.dust; if (!engine) { @@ -504,9 +502,9 @@ exports.dust.render = function(str, options, fn){ } if (!options || (options && !options.cache)) engine.cache = {}; - engine.onLoad = function(path, callback){ - if ('' === extname(path)) path += '.' + ext; - if ('/' !== path[0]) path = views + '/' + path; + engine.onLoad = function(path, callback) { + if (extname(path) === '') path += '.' + ext; + if (path[0] !== '/') path = views + '/' + path; read(path, options, callback); }; @@ -534,7 +532,7 @@ exports.swig = fromStringRenderer('swig'); * Swig string support. */ -exports.swig.render = function(str, options, fn){ +exports.swig.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.swig; if (!engine) { @@ -550,7 +548,7 @@ exports.swig.render = function(str, options, fn){ } try { - if(options.cache === true) options.cache = 'memory'; + if (options.cache === true) options.cache = 'memory'; engine.setDefaults({ cache: options.cache }); var tmpl = cache(options) || cache(options, engine.compile(str, options)); fn(null, tmpl(options)); @@ -570,7 +568,7 @@ exports.atpl = fromStringRenderer('atpl'); * Atpl string support. */ -exports.atpl.render = function(str, options, fn){ +exports.atpl.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.atpl || (requires.atpl = require('atpl')); try { @@ -592,7 +590,7 @@ exports.liquor = fromStringRenderer('liquor'); * Liquor string support. */ -exports.liquor.render = function(str, options, fn){ +exports.liquor.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.liquor || (requires.liquor = require('liquor')); try { @@ -614,7 +612,7 @@ exports.twig = fromStringRenderer('twig'); * Twig string support. */ -exports.twig.render = function(str, options, fn){ +exports.twig.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.twig || (requires.twig = require('twig').twig); var templateData = { @@ -639,8 +637,8 @@ exports.ejs = fromStringRenderer('ejs'); * EJS string support. */ -exports.ejs.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.ejs.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.ejs || (requires.ejs = require('ejs')); try { var tmpl = cache(options) || cache(options, engine.compile(str, options)); @@ -651,7 +649,6 @@ exports.ejs.render = function(str, options, fn){ }); }; - /** * Eco support. */ @@ -662,7 +659,7 @@ exports.eco = fromStringRenderer('eco'); * Eco string support. */ -exports.eco.render = function(str, options, fn){ +exports.eco.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.eco || (requires.eco = require('eco')); try { @@ -683,12 +680,12 @@ exports.jazz = fromStringRenderer('jazz'); * Jazz string support. */ -exports.jazz.render = function(str, options, fn){ +exports.jazz.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.jazz || (requires.jazz = require('jazz')); try { var tmpl = cache(options) || cache(options, engine.compile(str, options)); - tmpl.eval(options, function(str){ + tmpl.eval(options, function(str) { fn(null, str); }); } catch (err) { @@ -707,7 +704,7 @@ exports.jqtpl = fromStringRenderer('jqtpl'); * JQTPL string support. */ -exports.jqtpl.render = function(str, options, fn){ +exports.jqtpl.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.jqtpl || (requires.jqtpl = require('jqtpl')); try { @@ -729,7 +726,7 @@ exports.haml = fromStringRenderer('haml'); * Haml string support. */ -exports.haml.render = function(str, options, fn){ +exports.haml.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.haml || (requires.haml = require('hamljs')); try { @@ -751,8 +748,8 @@ exports.hamlet = fromStringRenderer('hamlet'); * Hamlet string support. */ -exports.hamlet.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.hamlet.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.hamlet || (requires.hamlet = require('hamlet')); try { options.locals = options; @@ -767,8 +764,8 @@ exports.hamlet.render = function(str, options, fn){ * Whiskers support. */ -exports.whiskers = function(path, options, fn){ - return promisify(fn, function (fn) { +exports.whiskers = function(path, options, fn) { + return promisify(fn, function(fn) { var engine = requires.whiskers || (requires.whiskers = require('whiskers')); engine.__express(path, options, fn); }); @@ -778,7 +775,7 @@ exports.whiskers = function(path, options, fn){ * Whiskers string support. */ -exports.whiskers.render = function(str, options, fn){ +exports.whiskers.render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires.whiskers || (requires.whiskers = require('whiskers')); try { @@ -799,7 +796,7 @@ exports['haml-coffee'] = fromStringRenderer('haml-coffee'); * Coffee-HAML string support. */ -exports['haml-coffee'].render = function(str, options, fn){ +exports['haml-coffee'].render = function(str, options, fn) { return promisify(fn, function(fn) { var engine = requires['haml-coffee'] || (requires['haml-coffee'] = require('haml-coffee')); try { @@ -821,8 +818,8 @@ exports.hogan = fromStringRenderer('hogan'); * Hogan string support. */ -exports.hogan.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.hogan.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.hogan || (requires.hogan = require('hogan.js')); try { var tmpl = cache(options) || cache(options, engine.compile(str, options)); @@ -843,8 +840,8 @@ exports.templayed = fromStringRenderer('templayed'); * templayed.js string support. */ -exports.templayed.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.templayed.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.templayed || (requires.templayed = require('templayed')); try { var tmpl = cache(options) || cache(options, engine(str)); @@ -908,7 +905,6 @@ exports.underscore.render = function(str, options, fn) { }); }; - /** * Lodash support. */ @@ -920,7 +916,7 @@ exports.lodash = fromStringRenderer('lodash'); */ exports.lodash.render = function(str, options, fn) { - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { var engine = requires.lodash || (requires.lodash = require('lodash')); try { var tmpl = cache(options) || cache(options, engine.template(str, options)); @@ -931,13 +927,12 @@ exports.lodash.render = function(str, options, fn) { }); }; - /** * Pug support. (formerly Jade) */ -exports.pug = function(path, options, fn){ - return promisify(fn, function (fn) { +exports.pug = function(path, options, fn) { + return promisify(fn, function(fn) { var engine = requires.pug; if (!engine) { try { @@ -964,8 +959,8 @@ exports.pug = function(path, options, fn){ * Pug string support. */ -exports.pug.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.pug.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.pug; if (!engine) { try { @@ -988,7 +983,6 @@ exports.pug.render = function(str, options, fn){ }); }; - /** * QEJS support. */ @@ -999,13 +993,13 @@ exports.qejs = fromStringRenderer('qejs'); * QEJS string support. */ -exports.qejs.render = function (str, options, fn) { - return promisify(fn, function (fn) { +exports.qejs.render = function(str, options, fn) { + return promisify(fn, function(fn) { try { var engine = requires.qejs || (requires.qejs = require('qejs')); - engine.render(str, options).then(function (result) { + engine.render(str, options).then(function(result) { fn(null, result); - }, function (err) { + }, function(err) { fn(err); }).done(); } catch (err) { @@ -1014,7 +1008,6 @@ exports.qejs.render = function (str, options, fn) { }); }; - /** * Walrus support. */ @@ -1025,8 +1018,8 @@ exports.walrus = fromStringRenderer('walrus'); * Walrus string support. */ -exports.walrus.render = function (str, options, fn) { - return promisify(fn, function (fn) { +exports.walrus.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.walrus || (requires.walrus = require('walrus')); try { var tmpl = cache(options) || cache(options, engine.parse(str)); @@ -1048,7 +1041,7 @@ exports.mustache = fromStringRenderer('mustache'); */ exports.mustache.render = function(str, options, fn) { - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { var engine = requires.mustache || (requires.mustache = require('mustache')); try { fn(null, engine.to_html(str, options, options.partials)); @@ -1062,7 +1055,7 @@ exports.mustache.render = function(str, options, fn) { * Just support. */ -exports.just = function(path, options, fn){ +exports.just = function(path, options, fn) { return promisify(fn, function(fn) { var engine = requires.just; if (!engine) { @@ -1078,8 +1071,8 @@ exports.just = function(path, options, fn){ * Just string support. */ -exports.just.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.just.render = function(str, options, fn) { + return promisify(fn, function(fn) { var JUST = require('just'); var engine = new JUST({ root: { page: str }}); engine.render('page', options, fn); @@ -1090,8 +1083,8 @@ exports.just.render = function(str, options, fn){ * ECT support. */ -exports.ect = function(path, options, fn){ - return promisify(fn, function (fn) { +exports.ect = function(path, options, fn) { + return promisify(fn, function(fn) { var engine = requires.ect; if (!engine) { var ECT = require('ect'); @@ -1106,8 +1099,8 @@ exports.ect = function(path, options, fn){ * ECT string support. */ -exports.ect.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.ect.render = function(str, options, fn) { + return promisify(fn, function(fn) { var ECT = require('ect'); var engine = new ECT({ root: { page: str }}); engine.render('page', options, fn); @@ -1124,8 +1117,8 @@ exports.mote = fromStringRenderer('mote'); * mote string support. */ -exports.mote.render = function(str, options, fn){ - return promisify(fn, function (fn) { +exports.mote.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.mote || (requires.mote = require('mote')); try { var tmpl = cache(options) || cache(options, engine.compile(str)); @@ -1140,8 +1133,8 @@ exports.mote.render = function(str, options, fn){ * Toffee support. */ -exports.toffee = function(path, options, fn){ - return promisify(fn, function (fn) { +exports.toffee = function(path, options, fn) { + return promisify(fn, function(fn) { var toffee = requires.toffee || (requires.toffee = require('toffee')); toffee.__consolidate_engine_render(path, options, fn); }); @@ -1152,10 +1145,10 @@ exports.toffee = function(path, options, fn){ */ exports.toffee.render = function(str, options, fn) { - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { var engine = requires.toffee || (requires.toffee = require('toffee')); try { - engine.str_render(str, options,fn); + engine.str_render(str, options, fn); } catch (err) { fn(err); } @@ -1172,8 +1165,8 @@ exports.dot = fromStringRenderer('dot'); * doT string support. */ -exports.dot.render = function (str, options, fn) { - return promisify(fn, function (fn) { +exports.dot.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.dot || (requires.dot = require('dot')); var extend = (requires.extend || (requires.extend = require('util')._extend)); try { @@ -1198,8 +1191,8 @@ exports.bracket = fromStringRenderer('bracket'); * bracket string support. */ -exports.bracket.render = function (str, options, fn) { - return promisify(fn, function (fn) { +exports.bracket.render = function(str, options, fn) { + return promisify(fn, function(fn) { var engine = requires.bracket || (requires.bracket = require('bracket-template')); try { var tmpl = cache(options) || cache(options, engine.default.compile(str, options)); @@ -1220,15 +1213,14 @@ exports.ractive = fromStringRenderer('ractive'); * Ractive string support. */ -exports.ractive.render = function(str, options, fn){ - return promisify(fn, function (fn) { - var engine = requires.ractive || (requires.ractive = require('ractive')); +exports.ractive.render = function(str, options, fn) { + return promisify(fn, function(fn) { + var Engine = requires.ractive || (requires.ractive = require('ractive')); - var template = cache(options) || cache(options, engine.parse(str)); + var template = cache(options) || cache(options, Engine.parse(str)); options.template = template; - if (options.data === null || options.data === undefined) - { + if (options.data === null || options.data === undefined) { var extend = (requires.extend || (requires.extend = require('util')._extend)); // Shallow clone the options object @@ -1237,7 +1229,7 @@ exports.ractive.render = function(str, options, fn){ // Remove consolidate-specific properties from the clone var i; var length; - var properties = ["template", "filename", "cache", "partials"]; + var properties = ['template', 'filename', 'cache', 'partials']; for (i = 0, length = properties.length; i < length; i++) { var property = properties[i]; delete options.data[property]; @@ -1245,7 +1237,7 @@ exports.ractive.render = function(str, options, fn){ } try { - fn(null, new engine(options).toHTML()); + fn(null, new Engine(options).toHTML()); } catch (err) { fn(err); } @@ -1262,8 +1254,8 @@ exports.nunjucks = fromStringRenderer('nunjucks'); * Nunjucks string support. */ -exports.nunjucks.render = function (str, options, fn) { - return promisify(fn, function (fn) { +exports.nunjucks.render = function(str, options, fn) { + return promisify(fn, function(fn) { try { @@ -1274,10 +1266,7 @@ exports.nunjucks.render = function (str, options, fn) { // deprecated fallback support for express // // - if (options.settings && options.settings.views) - env = engine.configure(options.settings.views); - else if (options.nunjucks && options.nunjucks.configure) - env = engine.configure.apply(engine, options.nunjucks.configure); + if (options.settings && options.settings.views) { env = engine.configure(options.settings.views); } else if (options.nunjucks && options.nunjucks.configure) { env = engine.configure.apply(engine, options.nunjucks.configure); } // // because `renderString` does not initiate loaders @@ -1312,15 +1301,14 @@ exports.nunjucks.render = function (str, options, fn) { new engine.FileSystemLoader(options.settings.views) ); } else if (options.nunjucks && options.nunjucks.loader) { - if (typeof options.nunjucks.loader === 'string') - env = new engine.Environment(new engine.FileSystemLoader(options.nunjucks.loader)); - else + if (typeof options.nunjucks.loader === 'string') { env = new engine.Environment(new engine.FileSystemLoader(options.nunjucks.loader)); } else { env = new engine.Environment( new engine.FileSystemLoader( options.nunjucks.loader[0], options.nunjucks.loader[1] ) ); + } } env.renderString(str, options, fn); @@ -1331,7 +1319,6 @@ exports.nunjucks.render = function (str, options, fn) { }); }; - /** * HTMLing support. */ @@ -1343,7 +1330,7 @@ exports.htmling = fromStringRenderer('htmling'); */ exports.htmling.render = function(str, options, fn) { - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { var engine = requires.htmling || (requires.htmling = require('htmling')); try { var tmpl = cache(options) || cache(options, engine.string(str)); @@ -1354,21 +1341,19 @@ exports.htmling.render = function(str, options, fn) { }); }; - /** * Rendering function */ function requireReact(module, filename) { var babel = requires.babel || (requires.babel = require('babel-core')); - var compiled = babel.transformFileSync(filename, { presets: [ 'react' ] }).code + var compiled = babel.transformFileSync(filename, { presets: [ 'react' ] }).code; return module._compile(compiled, filename); } exports.requireReact = requireReact; - /** * Converting a string into a node module. */ @@ -1389,19 +1374,18 @@ function requireReactString(src, filename) { return m.exports; } - /** * A naive helper to replace {{tags}} with options.tags content */ -function reactBaseTmpl(data, options){ +function reactBaseTmpl(data, options) { var exp; var regex; // Iterates through the keys in file object // and interpolate / replace {{key}} with it's value - for (var k in options){ - if (options.hasOwnProperty(k)){ + for (var k in options) { + if (options.hasOwnProperty(k)) { exp = '{{' + k + '}}'; regex = new RegExp(exp, 'g'); if (data.match(regex)) { @@ -1424,7 +1408,7 @@ exports.plates = fromStringRenderer('plates'); */ exports.plates.render = function(str, options, fn) { - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { var engine = requires.plates || (requires.plates = require('plates')); var map = options.map || undefined; try { @@ -1434,14 +1418,12 @@ exports.plates.render = function(str, options, fn) { fn(err); } }); -} - - +}; /** * The main render parser for React bsaed templates */ -function reactRenderer(type){ +function reactRenderer(type) { if (require.extensions) { @@ -1485,14 +1467,14 @@ function reactRenderer(type){ var content; var parsed; - if (!cache(options)){ + if (!cache(options)) { // Parsing if (type === 'path') { - var path = resolve(str) - delete require.cache[path] - Code = require(path) + var path = resolve(str); + delete require.cache[path]; + Code = require(path); } else { - Code = requireReactString(str) + Code = requireReactString(str); } Factory = cache(options, react.createFactory(Code)); @@ -1503,10 +1485,10 @@ function reactRenderer(type){ parsed = new Factory(options); content = (isNonStatic) ? ReactDOM.renderToString(parsed) : ReactDOM.renderToStaticMarkup(parsed); - if (base){ + if (base) { baseStr = readCache[str] || fs.readFileSync(resolve(base), 'utf8'); - if (enableCache){ + if (enableCache) { readCache[str] = baseStr; } @@ -1528,7 +1510,6 @@ function reactRenderer(type){ */ exports.react = reactRenderer('path'); - /** * React JS string support. */ @@ -1547,11 +1528,11 @@ exports['arc-templates'] = fromStringRenderer('arc-templates'); exports['arc-templates'].render = function(str, options, fn) { var readFileWithOptions = Promise.promisify(read); var consolidateFileSystem = {}; - consolidateFileSystem.readFile = function (path) { + consolidateFileSystem.readFile = function(path) { return readFileWithOptions(path, options); }; - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { try { var engine = requires['arc-templates']; if (!engine) { @@ -1560,9 +1541,9 @@ exports['arc-templates'].render = function(str, options, fn) { } var compiler = cache(options) || cache(options, engine.compileString(str, options.filename)); - compiler.then(function (func) { return func(options); }) - .then(function (result) { fn(null, result.content); }) - .catch(fn); + compiler.then(function(func) { return func(options); }) + .then(function(result) { fn(null, result.content); }) + .catch(fn); } catch (err) { fn(err); } @@ -1594,7 +1575,7 @@ exports.vash.render = function(str, options, fn) { var tmpl = cache(options) || cache(options, engine.compile(str, options)); tmpl(options, function sealLayout(err, ctx) { - if(err) fn(err); + if (err) fn(err); ctx.finishLayout(); fn(null, ctx.toString().replace(/\n$/, '')); }); @@ -1615,7 +1596,7 @@ exports.slm = fromStringRenderer('slm'); */ exports.slm.render = function(str, options, fn) { - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { var engine = requires.slm || (requires.slm = require('slm')); try { @@ -1631,14 +1612,14 @@ exports.slm.render = function(str, options, fn) { * Marko support. */ -exports.marko = function(path, options, fn){ - return promisify(fn, function (fn) { +exports.marko = function(path, options, fn) { + return promisify(fn, function(fn) { var engine = requires.marko || (requires.marko = require('marko')); options.writeToDisk = !!options.cache; try { var tmpl = cache(options) || cache(options, engine.load(path, options)); - tmpl.renderToString(options, fn) + tmpl.renderToString(options, fn); } catch (err) { fn(err); } @@ -1650,14 +1631,14 @@ exports.marko = function(path, options, fn){ */ exports.marko.render = function(str, options, fn) { - return promisify(fn, function (fn) { + return promisify(fn, function(fn) { var engine = requires.marko || (requires.marko = require('marko')); options.writeToDisk = !!options.cache; options.filename = options.filename || 'string.marko'; try { var tmpl = cache(options) || cache(options, engine.load(options.filename, str, options)); - tmpl.renderToString(options, fn) + tmpl.renderToString(options, fn); } catch (err) { fn(err); } @@ -1688,7 +1669,7 @@ exports.teacup = function(path, options, fn) { /** * Teacup string support. */ -exports.teacup.render = function(str, options, fn){ +exports.teacup.render = function(str, options, fn) { var coffee = require('coffee-script'); var vm = require('vm'); var sandbox = { @@ -1700,7 +1681,7 @@ exports.teacup.render = function(str, options, fn){ var tmpl = sandbox.module.exports; fn(null, tmpl(options)); }); -} +}; /** * expose the instance of the engine diff --git a/test/shared/dust.js b/test/shared/dust.js index f4dd241..9971788 100644 --- a/test/shared/dust.js +++ b/test/shared/dust.js @@ -7,7 +7,7 @@ var fs = require('fs'); exports.test = function(name) { var user = { name: 'Tobi' }; - describe(name, function(){ + describe(name, function() { // Use case: return upper case string. it('should support fetching template name from the context', function(done) { var viewsDir = 'test/fixtures/' + name; @@ -28,7 +28,7 @@ exports.test = function(name) { cons.requires.dust = dust; } - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) return done(err); html.should.eql('

Tobi

user_template_name'); return done(); diff --git a/test/shared/filters.js b/test/shared/filters.js index f4d619a..ae7a155 100644 --- a/test/shared/filters.js +++ b/test/shared/filters.js @@ -4,7 +4,7 @@ var fs = require('fs'); exports.test = function(name) { var user = { name: 'Tobi' }; - describe(name, function(){ + describe(name, function() { // Use case: return upper case string. it('should support filters', function(done) { @@ -15,7 +15,7 @@ exports.test = function(name) { return object.toUpperCase(); }}}; - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) return done(err); html.should.eql('TOBI'); return done(); diff --git a/test/shared/helpers.js b/test/shared/helpers.js index f2c0a16..ddde9e9 100644 --- a/test/shared/helpers.js +++ b/test/shared/helpers.js @@ -7,9 +7,9 @@ var readFileSync = fs.readFileSync; exports.test = function(name) { - describe(name, function(){ + describe(name, function() { - afterEach(function(){ + afterEach(function() { fs.readFile = readFile; fs.readFileSync = readFileSync; }); @@ -19,7 +19,7 @@ exports.test = function(name) { if (name === 'handlebars') { user = { name: 'Tobi' }; - // Use case: return safe HTML that won’t be escaped in the final render. + // Use case: return safe HTML that won’t be escaped in the final render. it('should support helpers', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/helpers.' + name).toString(); @@ -28,7 +28,7 @@ exports.test = function(name) { return new handlebars.SafeString(object); }}}; - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) return done(err); html.should.equal('Tobi'); done(); @@ -39,8 +39,8 @@ exports.test = function(name) { if (name === 'vash') { user = { name: 'Tobi' }; - // See this for Vash helper system : https://github.com/kirbysayshi/vash#helper-system - // Use case: return as as lower case + // See this for Vash helper system : https://github.com/kirbysayshi/vash#helper-system + // Use case: return as as lower case it('should support helpers', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/helpers.' + name).toString(); @@ -49,7 +49,7 @@ exports.test = function(name) { return text.toLowerCase(); }}}; - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) return done(err); html.should.equal('tobi'); done(); diff --git a/test/shared/includes.js b/test/shared/includes.js index eb4879d..2003b19 100644 --- a/test/shared/includes.js +++ b/test/shared/includes.js @@ -16,28 +16,28 @@ exports.test = function(name) { locals.includeDir = viewsDir; } - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) return done(err); - try{ + try { if (name === 'liquid') { html.should.eql('

Tobi

'); } else { html.should.eql('

Tobi

'); } return done(); - } catch(e) { + } catch (e) { return done(e); } }); }); if (name === 'nunjucks') { - it('should support extending views', function (done) { + it('should support extending views', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/layouts.' + name).toString(); var locals = {user: user, settings: {views: 'test/fixtures/' + name}}; - cons[name].render(str, locals, function (err, html) { + cons[name].render(str, locals, function(err, html) { if (err) return done(err); try { html.should.eql('

Tobi

'); diff --git a/test/shared/index.js b/test/shared/index.js index a15611b..8e6391b 100644 --- a/test/shared/index.js +++ b/test/shared/index.js @@ -7,41 +7,41 @@ var readFileSync = fs.readFileSync; exports.test = function(name) { var user = { name: 'Tobi' }; - describe(name, function(){ - afterEach(function(){ + describe(name, function() { + afterEach(function() { fs.readFile = readFile; fs.readFileSync = readFileSync; }); - it('should support locals', function(done){ + it('should support locals', function(done) { var path = 'test/fixtures/' + name + '/user.' + name; var locals = { user: user }; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.match(/Tobi/); done(); }); }); - it('should not cache by default', function(done){ + it('should not cache by default', function(done) { var path = 'test/fixtures/' + name + '/user.' + name; var locals = { user: user }; var calls = 0; - fs.readFileSync = function(){ + fs.readFileSync = function() { ++calls; return readFileSync.apply(this, arguments); }; - fs.readFile = function(){ + fs.readFile = function() { ++calls; readFile.apply(this, arguments); }; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.match(/Tobi/); - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.match(/Tobi/); calls.should.equal(name === 'atpl' ? 4 : 2); @@ -50,19 +50,19 @@ exports.test = function(name) { }); }); - it('should support caching', function(done){ + it('should support caching', function(done) { var path = 'test/fixtures/' + name + '/user.' + name; var locals = { user: user, cache: true }; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); - fs.readFile = function(path){ + fs.readFile = function(path) { done(new Error('fs.readFile() called with ' + path)); }; html.should.match(/Tobi/); - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.match(/Tobi/); done(); @@ -70,45 +70,45 @@ exports.test = function(name) { }); }); - it('should support rendering a string', function(done){ + it('should support rendering a string', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/user.' + name).toString(); var locals = { user: user }; - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) return done(err); html.should.match(/Tobi/); done(); }); }); - it('should return a promise if no callback provided', function(done){ + it('should return a promise if no callback provided', function(done) { var path = 'test/fixtures/' + name + '/user.' + name; var locals = { user: user }; var result = cons[name](path, locals); - result.then(function (html) { + result.then(function(html) { html.should.match(/Tobi/); done(); }) - .catch(function (err) { - done(err); - }); + .catch(function(err) { + done(err); + }); }); - it('should return a promise if no callback provided (string)', function(done){ + it('should return a promise if no callback provided (string)', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/user.' + name).toString(); var locals = { user: user }; var result = cons[name].render(str, locals); - result.then(function (html) { + result.then(function(html) { html.should.match(/Tobi/); done(); }) - .catch(function (err) { - done(err); - }); + .catch(function(err) { + done(err); + }); }); - it('should be exposed in the requires object', function(){ + it('should be exposed in the requires object', function() { var should = require('should'); var requiredName = name; should.exist(cons.requires[requiredName]); diff --git a/test/shared/partials.js b/test/shared/partials.js index 6b4b9a0..f848766 100644 --- a/test/shared/partials.js +++ b/test/shared/partials.js @@ -8,42 +8,42 @@ var readFileSync = fs.readFileSync; exports.test = function(name) { var user = { name: 'Tobi' }; - describe(name, function(){ - afterEach(function(){ + describe(name, function() { + afterEach(function() { fs.readFile = readFile; fs.readFileSync = readFileSync; }); if (name === 'hogan' || name === 'mustache' || name === 'handlebars' || name === 'ractive') { - it('should support partials', function(done){ + it('should support partials', function(done) { var path = 'test/fixtures/' + name + '/partials.' + name; var locals = { user: user, partials: { partial: 'user' } }; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.equal('

Tobi

'); done(); }); }); - it('should support absolute path partial', function(done){ + it('should support absolute path partial', function(done) { var path = 'test/fixtures/' + name + '/partials.' + name; - var locals = {user: user, partials: {partial: join(__dirname, '/../../test/fixtures/' , name, '/user') }}; - cons[name](path, locals, function(err, html){ + var locals = {user: user, partials: {partial: join(__dirname, '/../../test/fixtures/', name, '/user') }}; + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.equal('

Tobi

'); done(); }); }); - it('should support relative path partial', function(done){ + it('should support relative path partial', function(done) { var path = 'test/fixtures/' + name + '/partials.' + name; var locals = {user: user, partials: {partial: '../' + name + '/user' }}; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.equal('

Tobi

'); done(); }); }); } else if (name === 'underscore') { - it('should support partials', function(done){ + it('should support partials', function(done) { var path = 'test/fixtures/' + name + '/partials.' + name; var locals = { user: user, @@ -51,20 +51,20 @@ exports.test = function(name) { partial: 'user_partial' } }; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) return done(err); html.should.equal('

Tobi

Tobi from user_partial!

'); done(); }); }); } else { - it('should support rendering a partial', function(done){ + it('should support rendering a partial', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/user_partial.' + name).toString(); var locals = { user: user, - views: "./test/fixtures/" + name + views: './test/fixtures/' + name }; - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) return done(err); html.should.equal('

Tobi from partial!

Tobi

'); done(); diff --git a/test/shared/react.js b/test/shared/react.js index 01cf70c..48d5ade 100644 --- a/test/shared/react.js +++ b/test/shared/react.js @@ -6,25 +6,24 @@ var fs = require('fs'); var readFile = fs.readFile; var readFileSync = fs.readFileSync; - exports.test = function(name) { 'use strict'; var user = { name: 'Tobi' }; var cons; - describe(name, function(){ + describe(name, function() { - beforeEach(function(){ + beforeEach(function() { cons = consolidate; fs.readFile = readFile; fs.readFileSync = readFileSync; }); - it('should support locals', function(done){ + it('should support locals', function(done) { var path = 'test/fixtures/' + name + '/user.' + name; var locals = { user: user }; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) { return done(err); @@ -35,24 +34,24 @@ exports.test = function(name) { }); }); - it('should support promises', function(done){ + it('should support promises', function(done) { var path = 'test/fixtures/' + name + '/user.' + name; var locals = { user: user }; cons[name](path, locals) - .then(function(html){ + .then(function(html) { html.should.equal('

Tobi

'); done(); }) - .catch(function (err) { + .catch(function(err) { done(err); }); }); - it('should support rendering a string', function(done){ + it('should support rendering a string', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/user.' + name).toString(); var locals = { user: user }; - cons[name].render(str, locals, function(err, html){ + cons[name].render(str, locals, function(err, html) { if (err) { return done(err); @@ -63,23 +62,21 @@ exports.test = function(name) { }); }); - - it('should support promises from a string', function(done){ + it('should support promises from a string', function(done) { var str = fs.readFileSync('test/fixtures/' + name + '/user.' + name).toString(); var locals = { user: user }; cons[name].render(str, locals) - .then(function(html){ + .then(function(html) { html.should.equal('

Tobi

'); done(); }) - .catch(function (err) { + .catch(function(err) { return done(err); }); }); - - it('should support rendering into a base template', function(done){ + it('should support rendering into a base template', function(done) { var path = 'test/fixtures/' + name + '/user.' + name; var locals = { user: user, @@ -87,7 +84,7 @@ exports.test = function(name) { title: 'My Title' }; - cons[name](path, locals, function(err, html){ + cons[name](path, locals, function(err, html) { if (err) { return done(err); @@ -98,6 +95,5 @@ exports.test = function(name) { }); }); - }); };