Merge pull request #6 from RobinQu/single-commit

adding support for partial,helpers; fixes for jslint

Gruntfile.js

@@ -65,7 +65,9 @@ module.exports = function(grunt) {
       globbedTemplateAndOutput: {
         template: 'test/fixtures/deep/**/*.handlebars',
         templateData: 'test/fixtures/deep/**/*.json',
-        output: 'tmp/deep/**/*.html'
+        output: 'tmp/deep/**/*.html',
+        helpers: 'test/helpers/**/*.js',
+        partials: 'test/fixtures/deep/shared/**/*.handlebars'
       }
     },
 

tasks/compile-handlebars.js

@@ -21,9 +21,7 @@ module.exports = function(grunt) {
     if (grunt.file.expand(config).length) {
       return grunt.file.expand(config);
     }
-    else {
-      return [config];
-    }
+    return [config];
   };
 
   /* Guesses the file extension based on
@@ -33,7 +31,9 @@ module.exports = function(grunt) {
     var extension = filepath.split('/').pop().split('.');
     extension.shift();
     extension = extension.join('.');
-    if (extension) extension = '.' + extension;
+    if (extension) {
+      extension = '.' + extension;
+    }
     return extension;
   };
 
@@ -42,7 +42,9 @@ module.exports = function(grunt) {
   var parseData = function(data) {
     /* grunt.file chokes on objects, so we
     * check for it immiedietly */
-    if (grunt.util.kindOf(data) === 'object') return data;
+    if (grunt.util.kindOf(data) === 'object') {
+      return data;
+    }
 
     /* data isn't an object, so its probably
     * a file. */
@@ -59,7 +61,9 @@ module.exports = function(grunt) {
    * version of the filename       */
   var isGlob = function(filename) {
     var match = filename.match(/[^\*]*/);
-    if (match[0] !== filename) return match.pop();
+    if (match[0] !== filename) {
+      return match.pop();
+    }
   };
 
   /* Figures out the name of the file before
@@ -80,28 +84,48 @@ module.exports = function(grunt) {
   };
 
   var getName = function(filename, basename) {
-    if (grunt.util.kindOf(filename) === 'object') return filename;
-    if (grunt.file.exists(filename)) return filename;
-    if (isGlob(filename)) return isGlob(filename) + basename + filetype(filename);
+    if (grunt.util.kindOf(filename) === 'object') {
+      return filename;
+    }
+    if (grunt.file.exists(filename)) {
+      return filename;
+    }
+    if (isGlob(filename)) {
+      return isGlob(filename) + basename + filetype(filename);
+    }
     return filename;
   };
 
   grunt.registerMultiTask('compile-handlebars', 'Compile Handlebars templates ', function() {
+    var path = require('path');
     var config = this.data;
     var templates = getConfig(config.template);
     var templateData = config.templateData;
-
+    var helpers = config.helpers ? getConfig(config.helpers): [];
+    var partials = config.partials ? getConfig(config.partials) : [];
+
+    helpers.forEach(function (helper) {
+      var basename = getBasename(helper, config.helpers);
+      handlebars.registerHelper(basename, require(path.resolve(helper)));
+    });
+
+    partials.forEach(function (partial) {
+      var basename = getBasename(partial, config.partials);
+      handlebars.registerPartial(basename, require(path.resolve(partial)));
+    });
 
     templates.forEach(function(template) {
       var compiledTemplate = handlebars.compile(parseData(template));
       var basename = getBasename(template, config.template);
       var html = '';
 
-      if (config.preHTML) html += parseData(getName(config.preHTML, basename));
-
+      if (config.preHTML) {
+        html += parseData(getName(config.preHTML, basename));
+      }
       html += compiledTemplate(parseData(getName(templateData, basename)));
-
-      if (config.postHTML) html += parseData(getName(config.postHTML, basename));
+      if (config.postHTML) {
+        html += parseData(getName(config.postHTML, basename));
+      }
 
       grunt.file.write(getName(config.output, basename), html);
     });

test/compile_handlebars_test.js

@@ -65,6 +65,18 @@ exports.clean = {
 
     test.equal(deepActual, deepExpected, 'Deeply globbed files should generated equally named output files');
 
+    test.done();
+  },
+
+  helperAndPartial: function (test) {
+    test.expect(1);
+
+    var actual = grunt.file.read('tmp/deep/helperAndPartial.html');
+    var expected = grunt.file.read('test/expected/helperAndPartial.html');
+
+    test.equal(actual, expected, 'Helpers and partials should be corrected renderred');
+
     test.done();
   }
+
 };

test/expected/deep/spanish.html

@@ -1 +1 @@
-<h1>hola, mundo</h1>
+<h1>hola, mundo</h1>

test/expected/helperAndPartial.html

@@ -0,0 +1,2 @@
+super helper!
+foo partial

test/fixtures/deep/helperAndPartial.handlebars

@@ -0,0 +1,2 @@
+{{super_helper}}
+{{> foo}}

test/fixtures/deep/helperAndPartial.json

@@ -0,0 +1,3 @@
+{
+  "hello": "world"
+}

test/fixtures/deep/shared/foo.handlebars

@@ -0,0 +1 @@
+foo partial

test/fixtures/deep/spanish.handlebars

@@ -1 +1 @@
-<h1>{{saludo}}{{puntuacion}} {{ubicacion}}</h1>
+<h1>{{saludo}}{{puntuacion}} {{ubicacion}}</h1>

test/helpers/super_helper.js

@@ -0,0 +1,5 @@
+module.exports = function (context, option) {
+
+  return "super helper!";
+
+};