add partials support

lib/consolidate.js

@@ -91,21 +91,53 @@ function read(path, options, fn) {
   });
 }
 
+/**
+ * Read `path` with `options` with
+ * callback `(err, str)`. When `options.cache`
+ * is true the partial string will be cached.
+ *
+ * @param {String} options
+ * @param {Function} fn
+ * @api private
+ */
+
+function readPartials(path, options, fn) {
+  if (!options.partials) return fn();
+  var partials = options.partials;
+  var keys = Object.keys(partials);
+
+  function next(index) {
+    if (index == keys.length) return fn(null);
+    var key = keys[index];
+    var file = join(dirname(path), partials[key] + extname(path));
+    read(file, options, function (err, str) {
+      if (err) return fn(err);
+      options.partials[key] = str;
+      next(++index);
+    });
+  }
+
+  next(0);
+}
+
 /**
  * fromStringRenderer
  */
 
 function fromStringRenderer(name) {
   return function(path, options, fn){
     options.filename = path;
-    if (cache(options)) {
-      exports[name].render('', options, fn);
-    } else {
-      read(path, options, function(err, str){
-        if (err) return fn(err);
-        exports[name].render(str, options, fn);
-      });
-    }
+    readPartials(path, options, function (err) {
+      if (err) return fn(err);
+      if (cache(options)) {
+        exports[name].render('', options, fn);
+      } else {
+        read(path, options, function(err, str){
+          if (err) return fn(err);
+          exports[name].render(str, options, fn);
+        });
+      }
+    });
   };
 }
 
@@ -155,6 +187,7 @@ exports.dust.render = function(str, options, fn){
     if (options.views) views = options.views;
     if (options.settings && options.settings.views) views = options.settings.views;
   }
+
   engine.onLoad = function(path, callback){
     if ('' == extname(path)) path += '.' + ext;
     if ('/' !== path[0]) path = views + '/' + path;
@@ -367,7 +400,7 @@ exports.hogan.render = function(str, options, fn){
   var engine = requires.hogan || (requires.hogan = require('hogan.js'));
   try {
     var tmpl = cache(options) || cache(options, engine.compile(str, options));
-    fn(null, tmpl.render(options));
+    fn(null, tmpl.render(options, options.partials));
   } catch (err) {
     fn(err);
   }
@@ -386,6 +419,9 @@ exports.handlebars = fromStringRenderer('handlebars');
 exports.handlebars.render = function(str, options, fn) {
   var engine = requires.handlebars || (requires.handlebars = require('handlebars'));
   try {
+    for (var partial in options.partials) {
+      engine.registerPartial(partial, options.partials[partial]);
+    }
     var tmpl = cache(options) || cache(options, engine.compile(str, options));
     fn(null, tmpl(options));
   } catch (err) {
@@ -482,7 +518,7 @@ exports.mustache = fromStringRenderer('mustache');
 exports.mustache.render = function(str, options, fn) {
   var engine = requires.mustache || (requires.mustache = require('mustache'));
   try {
-    fn(null, engine.to_html(str, options));
+    fn(null, engine.to_html(str, options, options.partials));
   } catch (err) {
     fn(err);
   }

package.json

@@ -24,7 +24,7 @@
     "hogan.js": "2.0.0",
     "dust": "0.3.0",
     "dustjs-linkedin": "0.4.0",
-    "handlebars": "1.0.5beta",
+    "handlebars": "1.0.7",
     "underscore": "1.3.3",
     "qejs": "0.0.1",
     "walrus": "0.9.0",

test/consolidate.js

@@ -10,14 +10,17 @@ require('./shared').test('eco');
 require('./shared').test('whiskers');
 require('./shared').test('haml-coffee');
 require('./shared').test('hogan');
+require('./shared/partials').test('hogan');
 require('./shared').test('dust');
 require('./shared/partials').test('dust');
 require('./shared').test('handlebars');
+require('./shared/partials').test('handlebars');
 require('./shared').test('underscore');
 require('./shared').test('qejs');
 require('./shared').test('walrus');
 require('./shared').test('mustache');
+require('./shared/partials').test('mustache');
 require('./shared').test('just');
 require('./shared').test('ect');
 require('./shared').test('mote');
-require('./shared').test('toffee');
+require('./shared').test('toffee');

test/fixtures/handlebars/partials.handlebars

@@ -0,0 +1 @@
+{{>partial}}

test/fixtures/hogan/partials.hogan

@@ -0,0 +1 @@
+{{>partial}}

test/fixtures/mustache/partials.mustache

@@ -0,0 +1 @@
+{{>partial}}

test/shared/partials.js

@@ -13,17 +13,30 @@ exports.test = function(name) {
       fs.readFileSync = readFileSync;
     });
 
-    it('should support rendering a partial', function(done){
-      var str = fs.readFileSync('test/fixtures/' + name + '/user_partial.' + name).toString();
-      var locals = { 
-        user: user,
-        views: "./test/fixtures/" + name
-      };
-      cons[name].render(str, locals, function(err, html){
-        if (err) return done(err);
-        html.should.equal('<p>Tobi from partial!</p><p>Tobi</p>');
-        done();
+    if (name == 'hogan' || name == 'mustache' || name == 'handlebars') {
+      it('should support partials', function(done){
+        var path = 'test/fixtures/' + name + '/partials.' + name;
+        var locals = { user: user, partials: { partial: 'user' } };
+        cons[name](path, locals, function(err, html){
+          if (err) return done(err);
+          html.should.equal('<p>Tobi</p>');
+          done();
+        });
       });
-    });
+    }
+    else {
+      it('should support rendering a partial', function(done){
+        var str = fs.readFileSync('test/fixtures/' + name + '/user_partial.' + name).toString();
+        var locals = { 
+          user: user,
+          views: "./test/fixtures/" + name
+        };
+        cons[name].render(str, locals, function(err, html){
+          if (err) return done(err);
+          html.should.equal('<p>Tobi from partial!</p><p>Tobi</p>');
+          done();
+        });
+      });
+    }
   });
 };