From 5dcedcee6f319ee284eaa4856f7c849fe8e1a364 Mon Sep 17 00:00:00 2001 From: Gary Anikin Date: Wed, 15 Mar 2017 09:42:50 +0300 Subject: [PATCH 1/3] Pass timestamp option for svgo(node engine) --- tasks/engines/node.js | 4 +++- tasks/webfont.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tasks/engines/node.js b/tasks/engines/node.js index 8498928..f232b96 100644 --- a/tasks/engines/node.js +++ b/tasks/engines/node.js @@ -54,7 +54,9 @@ module.exports = function(o, allDone) { ttf: function(done) { getFont('svg', function(svgFont) { - var font = svg2ttf(svgFont, {}); + var font = svg2ttf(svgFont, { + ts: o.ts + }); font = new Buffer(font.buffer); autohintTtfFont(font, function(hintedFont) { // ttfautohint is optional diff --git a/tasks/webfont.js b/tasks/webfont.js index e793f21..7cf3907 100755 --- a/tasks/webfont.js +++ b/tasks/webfont.js @@ -117,7 +117,8 @@ module.exports = function(grunt) { cache: options.cache || path.join(__dirname, '..', '.cache'), callback: options.callback, customOutputs: options.customOutputs, - execMaxBuffer: options.execMaxBuffer || 1024 * 200 + execMaxBuffer: options.execMaxBuffer || 1024 * 200, + ts: (options.ts === 0) ? 0 : options.ts || Math.floor(Date.now() / 1000) }; o = _.extend(o, { From a5d7affac11888385166f88d50000e10051e4c51 Mon Sep 17 00:00:00 2001 From: Igor Anikin Date: Thu, 18 May 2017 12:12:50 +0300 Subject: [PATCH 2/3] Add tests and docs --- Gruntfile.js | 31 +++++++++++++++++++++++++++ Readme.md | 6 ++++++ package.json | 1 + tasks/engines/node.js | 2 +- tasks/webfont.js | 2 +- test/webfont_test.js | 50 ++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 89 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index febecc5..636ea33 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -358,6 +358,37 @@ module.exports = function(grunt) { types: 'woff' } }, + timestamp_same_1: { + src: 'test/src/*.svg', + dest: 'test/tmp/timestamp_same', + options: { + fontFilename: 'same_1', + timestamp: 0 + } + }, + timestamp_same_2: { + src: 'test/src/*.svg', + dest: 'test/tmp/timestamp_same', + options: { + fontFilename: 'same_2', + timestamp: 0 + } + }, + timestamp_different_1: { + src: 'test/src/*.svg', + dest: 'test/tmp/timestamp_different', + options: { + fontFilename: 'different_1', + timestamp: 0 + } + }, + timestamp_different_2: { + src: 'test/src/*.svg', + dest: 'test/tmp/timestamp_different', + options: { + fontFilename: 'different_2' + } + }, }, nodeunit: { all: ['test/webfont_test.js'] diff --git a/Readme.md b/Readme.md index 4c77afa..6d441da 100644 --- a/Readme.md +++ b/Readme.md @@ -476,6 +476,12 @@ At compile-time each template will have access to the same context as the compil #### execMaxBuffer If you get stderr maxBuffer exceeded warning message, engine probably logged a lot of warning messages. To see this warnings run grunt in verbose mode `grunt --verbose`. To go over this warning you can try to increase buffer size by this option. Default value is `1024 * 200` +#### timestamp + +Type: `number` Default: `Date.now()` +Unix timestamp (in seconds) to override font creation time +NOTE: Work only with node engine + ### Config Examples #### Simple font generation diff --git a/package.json b/package.json index d1eb069..996d146 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "grunt-contrib-watch": "~0.6.1", "grunt-jscs": "~1.0.0", "load-grunt-tasks": "~3.4.0", + "promise": "^7.1.1", "stylus": "~0.53.0", "xml2js": "~0.4.16" }, diff --git a/tasks/engines/node.js b/tasks/engines/node.js index f232b96..39b6649 100644 --- a/tasks/engines/node.js +++ b/tasks/engines/node.js @@ -55,7 +55,7 @@ module.exports = function(o, allDone) { ttf: function(done) { getFont('svg', function(svgFont) { var font = svg2ttf(svgFont, { - ts: o.ts + ts: o.timestamp }); font = new Buffer(font.buffer); autohintTtfFont(font, function(hintedFont) { diff --git a/tasks/webfont.js b/tasks/webfont.js index 7cf3907..fb81a79 100755 --- a/tasks/webfont.js +++ b/tasks/webfont.js @@ -118,7 +118,7 @@ module.exports = function(grunt) { callback: options.callback, customOutputs: options.customOutputs, execMaxBuffer: options.execMaxBuffer || 1024 * 200, - ts: (options.ts === 0) ? 0 : options.ts || Math.floor(Date.now() / 1000) + timestamp: (options.timestamp === 0) ? 0 : options.timestamp || Math.floor(Date.now() / 1000) }; o = _.extend(o, { diff --git a/test/webfont_test.js b/test/webfont_test.js index 550c79c..71f8852 100644 --- a/test/webfont_test.js +++ b/test/webfont_test.js @@ -6,6 +6,8 @@ var path = require('path'); var grunt = require('grunt'); var parseXMLString = require('xml2js').parseString; var wf = require('../tasks/util/util'); +var crypto = require('crypto'); +var Promise = require('promise'); function find(haystack, needle) { return haystack.indexOf(needle) !== -1; @@ -930,6 +932,52 @@ exports.webfont = { test.ok(fs.existsSync('test/tmp/filename_length/icons.html')); test.done(); - } + }, + + // If font created multiple times with same value as timestamp option + // then md5 of created files must be the same too + timestamp_same: function (test) { + var promise_1 = new Promise(function(resolve, reject) { + fs.readFile('test/tmp/timestamp_same/same_1.ttf', function (err, data) { + resolve(crypto.createHash('md5').update(data, 'utf8').digest('hex')); + }); + }); + + var promise_2 = new Promise(function(resolve, reject) { + fs.readFile('test/tmp/timestamp_same/same_2.ttf', function (err, data) { + resolve(crypto.createHash('md5').update(data, 'utf8').digest('hex')); + }); + }); + + Promise.all([promise_1, promise_2]) + .then(function(data) { + // md5 must be the same + test.ok(data[0] === data[1]); + test.done(); + }); + }, + + // If font created multiple times with different value as timestamp option + // then md5 of created files must be different + timestamp_different: function (test) { + var promise_1 = new Promise(function(resolve, reject) { + fs.readFile('test/tmp/timestamp_different/different_1.ttf', function (err, data) { + resolve(crypto.createHash('md5').update(data, 'utf8').digest('hex')); + }); + }); + + var promise_2 = new Promise(function(resolve, reject) { + fs.readFile('test/tmp/timestamp_different/different_2.ttf', function (err, data) { + resolve(crypto.createHash('md5').update(data, 'utf8').digest('hex')); + }); + }); + + Promise.all([promise_1, promise_2]) + .then(function(data) { + // md5 must be the different + test.ok(data[0] !== data[1]); + test.done(); + }); + }, }; From 58dc3882a0aaa382c00b0c5de06c964cadd87328 Mon Sep 17 00:00:00 2001 From: Igor Anikin Date: Thu, 18 May 2017 12:25:56 +0300 Subject: [PATCH 3/3] Fix for tests --- Gruntfile.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 636ea33..cdf90aa 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -363,7 +363,8 @@ module.exports = function(grunt) { dest: 'test/tmp/timestamp_same', options: { fontFilename: 'same_1', - timestamp: 0 + timestamp: 0, + engine: 'node' } }, timestamp_same_2: { @@ -371,7 +372,8 @@ module.exports = function(grunt) { dest: 'test/tmp/timestamp_same', options: { fontFilename: 'same_2', - timestamp: 0 + timestamp: 0, + engine: 'node' } }, timestamp_different_1: { @@ -379,14 +381,16 @@ module.exports = function(grunt) { dest: 'test/tmp/timestamp_different', options: { fontFilename: 'different_1', - timestamp: 0 + timestamp: 0, + engine: 'node' } }, timestamp_different_2: { src: 'test/src/*.svg', dest: 'test/tmp/timestamp_different', options: { - fontFilename: 'different_2' + fontFilename: 'different_2', + engine: 'node' } }, },