Skip to content

Commit

Permalink
fix bug: cache actually not working (#664)
Browse files Browse the repository at this point in the history
Resolve issue #663 and add test.
  • Loading branch information
Ashinoko authored and phillipj committed Jul 27, 2018
1 parent 85a2c2d commit 28ca619
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
5 changes: 3 additions & 2 deletions mustache.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,10 +444,11 @@
*/
Writer.prototype.parse = function parse (template, tags) {
var cache = this.cache;
var tokens = cache[template];
var cacheKey = template + ':' + (tags || mustache.tags).join(':');
var tokens = cache[cacheKey];

if (tokens == null)
tokens = cache[template + ':' + (tags || mustache.tags).join(':')] = parseTemplate(template, tags);
tokens = cache[cacheKey] = parseTemplate(template, tags);

return tokens;
};
Expand Down
15 changes: 15 additions & 0 deletions test/parse-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ var expectations = {
: [ [ '#', 'foo', 0, 8, [ [ '#', 'a', 11, 17, [ [ 'text', ' ', 18, 22 ], [ 'name', 'b', 22, 27 ], [ 'text', '\n', 27, 28 ] ], 30 ] ], 37 ] ]
};

beforeEach(function (){
Mustache.clearCache();
});

describe('Mustache.parse', function () {

for (var template in expectations) {
Expand Down Expand Up @@ -135,4 +139,15 @@ describe('Mustache.parse', function () {
});
});

describe('when parsing a template with the same tags second time, return the cached tokens', function () {
it('returns the same tokens for the latter parse', function () {
var template = '{{foo}}[bar]';
var parsedResult1 = Mustache.parse(template);
var parsedResult2 = Mustache.parse(template);

assert.deepEqual(parsedResult1, parsedResult2);
assert.ok(parsedResult1 === parsedResult2);
});
});

});

0 comments on commit 28ca619

Please sign in to comment.