Merge branch 'swig-defaults'

Readme.md

@@ -74,11 +74,11 @@ cons[name]('views/page.html', { user: 'tobi' }, function(err, html){
 
 ## Caching
 
- To enable caching simply pass `{ cache: true }`. Engines _may_ use this option to cache things reading the file contents, compiled `Function`s etc. Engines which do _not_ support this may simply ignore it. All engines that consolidate.js implements I/O for will cache the file contents, ideal for production environments.
+ To enable or disable caching simply pass `{ cache: true/false }`. Engines _may_ use this option to cache things reading the file contents, compiled `Function`s etc. Engines which do _not_ support this may simply ignore it. All engines that consolidate.js implements I/O for will cache the file contents, ideal for production environments.
 
 ```js
 var cons = require('consolidate');
-cons.swig('views/page.html', { user: 'tobi' }, function(err, html){
+cons.swig('views/page.html', { cache: false, user: 'tobi' }, function(err, html){
   if (err) throw err;
   console.log(html);
 });

lib/consolidate.js

@@ -250,8 +250,10 @@ exports.swig = fromStringRenderer('swig');
 
 exports.swig.render = function(str, options, fn){
   var engine = requires.swig || (requires.swig = require('swig'));
+
   try {
     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));
   } catch (err) {

package.json

@@ -14,7 +14,7 @@
     "jade": "0.26.0",
     "ejs": "0.7.1",
     "eco": "1.1.0-rc-3",
-    "swig": "0.12.0",
+    "swig": "1.4.1",
     "jazz": "0.0.18",
     "jqtpl": "1.1.0",
     "liquor": "0.0.4",