From 2343e24d8afdcbf29794521c71f7edd71eb85e25 Mon Sep 17 00:00:00 2001 From: Thaddee Tyl Date: Sun, 20 Apr 2014 16:12:35 +0000 Subject: [PATCH] Load all templates through dot. --- badge.js | 21 ++++++--------------- coverage.svg | 2 +- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/badge.js b/badge.js index 38bc7e4..a836df2 100644 --- a/badge.js +++ b/badge.js @@ -18,31 +18,22 @@ canvasContext.font = '11px Verdana, "DejaVu Sans"'; // cache templates. var templates = {}; var templateFiles = fs.readdirSync('templates'); -templateFiles.forEach(function(file) { - templates[file] = fs.readFileSync( - path.join(__dirname, 'templates', file)).toString(); +templateFiles.forEach(function(filename) { + var templateData = fs.readFileSync( + path.join(__dirname, 'templates', filename)).toString(); + var style = filename.slice(0, -('-template.svg'.length)); + templates[style] = dot.template(templateData); }); var colorscheme = require(path.join(__dirname, 'colorscheme.json')); -function makeTemplate(template) { - // Template crafting action below. - var template = templates[(template || 'default') + '-template.svg']; - return dot.template(template); -} - -var defaultTemplate = makeTemplate(); - function optimize(string, callback) { var svgo = new SVGO(); svgo.optimize(string, callback); } function makeImage(data, cb) { - var template = defaultTemplate; - if (data.template) { - template = makeTemplate(data.template); - } + var template = templates[data.template || 'default']; if (data.colorscheme) { data.colorA = colorscheme[data.colorscheme].colorA; data.colorB = colorscheme[data.colorscheme].colorB; diff --git a/coverage.svg b/coverage.svg index 38226a7..43c515e 100644 --- a/coverage.svg +++ b/coverage.svg @@ -1 +1 @@ -coveragecoverage82.3%82.3% \ No newline at end of file +coveragecoverage81.4%81.4% \ No newline at end of file