engine-cache
Advanced tools
Comparing version 0.10.3 to 0.10.4
13
index.js
@@ -6,3 +6,3 @@ 'use strict'; | ||
var Helpers = require('helper-cache'); | ||
var extend = require('extend-shallow'); | ||
var merge = require('mixin-deep'); | ||
var forOwn = require('for-own'); | ||
@@ -82,3 +82,3 @@ var async = require('async'); | ||
engine.compile = engine.compile || fn.compile; | ||
engine.options = engine.options || fn.options || options || {}; | ||
engine.options = merge({}, engine.options || {}, fn.options || {}, options || {}); | ||
engine.helpers = new Helpers(options); | ||
@@ -98,3 +98,2 @@ engine.asyncHelpers = new AsyncHelpers(options); | ||
this.decorate(engine); | ||
if (ext[0] !== '.') { | ||
@@ -181,3 +180,3 @@ ext = '.' + ext; | ||
var opts = extend({}, {async: true}, options); | ||
var opts = merge({}, {async: true}, options); | ||
var self = this; | ||
@@ -199,3 +198,3 @@ return render.call(this, str, mergeHelpers.call(this, opts), function (err, content) { | ||
opts = opts || {}; | ||
opts.helpers = extend({}, this.helpers, opts.helpers); | ||
opts.helpers = merge({}, this.helpers, opts.helpers); | ||
return renderSync(str, opts); | ||
@@ -330,7 +329,7 @@ }; | ||
function mergeHelpers (options) { | ||
this.asyncHelpers.helpers = extend({}, | ||
this.asyncHelpers.helpers = merge({}, | ||
filterHelpers(this.helpers, true), | ||
filterHelpers(options.helpers, true)); | ||
options.helpers = extend({}, | ||
options.helpers = merge({}, | ||
filterHelpers(this.helpers), | ||
@@ -337,0 +336,0 @@ filterHelpers(options.helpers), |
{ | ||
"name": "engine-cache", | ||
"description": "express.js inspired template-engine manager.", | ||
"version": "0.10.3", | ||
"version": "0.10.4", | ||
"homepage": "https://github.com/jonschlinkert/engine-cache", | ||
@@ -47,5 +47,5 @@ "author": { | ||
"debug": "^2.1.3", | ||
"extend-shallow": "^1.1.2", | ||
"for-own": "^0.1.3", | ||
"helper-cache": "^0.6.0" | ||
"helper-cache": "^0.6.0", | ||
"mixin-deep": "^1.0.1" | ||
}, | ||
@@ -55,3 +55,3 @@ "devDependencies": { | ||
"engine-handlebars": "^0.6.1", | ||
"engine-lodash": "^0.5.0", | ||
"engine-lodash": "^0.6.2", | ||
"engines": "^0.4.0", | ||
@@ -58,0 +58,0 @@ "handlebars": "^3.0.1", |
@@ -41,3 +41,3 @@ # engine-cache [![NPM version](https://badge.fury.io/js/engine-cache.svg)](http://badge.fury.io/js/engine-cache) | ||
### [.getEngine](./index.js#L123) | ||
### [.getEngine](./index.js#L122) | ||
@@ -57,3 +57,3 @@ Return the engine stored by `ext`. If no `ext` is passed, the entire cache is returned. | ||
### [.load](./index.js#L235) | ||
### [.load](./index.js#L234) | ||
@@ -69,3 +69,3 @@ Load an object of engines onto the `cache`. Mostly useful for testing, but exposed as a public method. | ||
### [.helpers](./index.js#L269) | ||
### [.helpers](./index.js#L268) | ||
@@ -88,3 +88,3 @@ Get and set helpers for the given `ext` (engine). If no `ext` is passed, the entire helper cache is returned. | ||
### [.clear](./index.js#L287) | ||
### [.clear](./index.js#L286) | ||
@@ -131,5 +131,5 @@ Remove `ext` engine from the cache, or if no value is specified the entire cache is reset. | ||
_This file was generated by [verb-cli](https://github.com/assemble/verb-cli) on March 31, 2015._ | ||
_This file was generated by [verb-cli](https://github.com/assemble/verb-cli) on April 01, 2015._ | ||
[helper-cache]: https://github.com/jonschlinkert/helper-cache | ||
<!-- deps: swig lodash mocha engine-lodash handlebars --> |
15096
+ Addedmixin-deep@^1.0.1
+ Addedis-extendable@1.0.1(transitive)
+ Addedis-plain-object@2.0.4(transitive)
+ Addedisobject@3.0.1(transitive)
+ Addedmixin-deep@1.3.2(transitive)
- Removedextend-shallow@^1.1.2
- Removedextend-shallow@1.1.4(transitive)
- Removedkind-of@1.1.0(transitive)