Add baseline Handlebars support.

src/core/theme.js

@@ -10,10 +10,11 @@ Abstract theme representation.
     , validator = require('is-my-json-valid')
     , _ = require('underscore')
     , PATH = require('path')
+    , EXTEND = require('../utils/extend')
     , moment = require('moment');
 
   /**
-  The Theme class represents a specific presentation of a resume.
+  The Theme class is a representation of a FluentCV theme asset.
   @class Theme
   */
   function Theme() {
@@ -31,8 +32,12 @@ Abstract theme representation.
       return friendly[val] || val;
     }
 
-    // Remember the theme folder; might be custom
+    // Open the theme.json file; should have the same name as folder
     this.folder = themeFolder;
+    var pathInfo = PATH.parse( themeFolder );
+    var themeFile = PATH.join( themeFolder, pathInfo.base + '.json' );
+    var themeInfo = JSON.parse( FS.readFileSync( themeFile, 'utf8' ) );
+    EXTEND( true, this, themeInfo );
 
     // Iterate over all files in the theme folder, producing an array, fmts,
     // containing info for each file.

src/eng/handlebars-generator.js

@@ -0,0 +1,18 @@
+/**
+Handlebars template generate for FluentCV.
+@license MIT. Copyright (c) 2015 James M. Devlin / FluentDesk.
+*/
+
+(function() {
+
+  var _ = require('underscore');
+  var HANDLEBARS = require('handlebars');
+
+  module.exports = function( json, jst, format, cssInfo, opts ) {
+
+    var template = HANDLEBARS.compile(jst);
+    return template( { r: json, filt: opts.filters, cssInfo: cssInfo, headFragment: opts.headFragment || '' } )
+
+  };
+
+}());

src/eng/underscore-generator.js

@@ -0,0 +1,37 @@
+/**
+Underscore template generate for FluentCV.
+@license MIT. Copyright (c) 2015 James M. Devlin / FluentDesk.
+*/
+
+(function() {
+
+  var _ = require('underscore');
+
+  module.exports = function( json, jst, format, cssInfo, opts ) {
+
+    // Tweak underscore's default template delimeters
+    _.templateSettings = opts.template;
+
+    // Convert {{ someVar }} to {% print(filt.out(someVar) %}
+    // Convert {{ someVar|someFilter }} to {% print(filt.someFilter(someVar) %}
+    jst = jst.replace( _.templateSettings.interpolate, function replace(m, p1) {
+      if( p1.indexOf('|') > -1 ) {
+        var terms = p1.split('|');
+        return '{% print( filt.' + terms[1] + '( ' + terms[0] + ' )) %}';
+      }
+      else {
+        return '{% print( filt.out(' + p1 + ') ) %}';
+      }
+    });
+
+    // Strip {# comments #}
+    jst = jst.replace( _.templateSettings.comment, '');
+
+    // Compile and run the template. TODO: avoid unnecessary recompiles.
+    jst = _.template(jst)({ r: json, filt: opts.filters, cssInfo: cssInfo, headFragment: opts.headFragment || '' });
+
+    return jst;
+
+  };
+
+}());

src/gen/template-generator.js

@@ -1,9 +1,11 @@
 /**
 Template-based resume generator base for FluentCV.
-@license Copyright (c) 2015 | James M. Devlin
+@license MIT. Copyright (c) 2015 James M. Devlin / FluentDesk.
 */
 
-var FS = require( 'fs' )
+(function() {
+
+  var FS = require( 'fs' )
     , _ = require( 'underscore' )
     , MD = require( 'marked' )
     , XML = require( 'xml-escape' )
@@ -12,8 +14,9 @@ var FS = require( 'fs' )
     , EXTEND = require('../utils/extend')
     , Theme = require('../core/theme');
 
-// Default options.
+  // Default options.
-var _defaultOpts = {
+  var _defaultOpts = {
+    engine: 'underscore',
     keepBreaks: true,
     freezeBreaks: true,
     nSym: '&newl;', // newline entity
@@ -40,14 +43,14 @@ var _defaultOpts = {
       max_char: 80, // ← See lib/html.js in above-linked repo
       //wrap_line_length: 120, <-- Don't use this
     }
-};
+  };
 
-/**
+  /**
-TemplateGenerator performs resume generation via Underscore-style template
+  TemplateGenerator performs resume generation via local Handlebar or Underscore
-expansion and is appropriate for text-based formats like HTML, plain text,
+  style template expansion and is appropriate for text-based formats like HTML,
-and XML versions of Microsoft Word, Excel, and OpenOffice.
+  plain text, and XML versions of Microsoft Word, Excel, and OpenOffice.
-*/
+  */
-var TemplateGenerator = module.exports = BaseGenerator.extend({
+  var TemplateGenerator = module.exports = BaseGenerator.extend({
 
     /** outputFormat: html, txt, pdf, doc
         templateFormat: html or txt
@@ -96,7 +99,7 @@ var TemplateGenerator = module.exports = BaseGenerator.extend({
       var cssInfo = { file: curFmt.css ? curFmt.cssPath : null, data: curFmt.css || null };
 
       // Compile and invoke the template!
-    var mk = this.single( rez, curFmt.data, this.format, cssInfo, opts );
+      var mk = this.single( rez, curFmt.data, this.format, cssInfo, this.opts );
       this.onBeforeSave && (mk = this.onBeforeSave( { mk: mk, theme: theme, outputFile: f } ));
       FS.writeFileSync( f, mk, { encoding: 'utf8', flags: 'w' } );
 
@@ -112,65 +115,50 @@ var TemplateGenerator = module.exports = BaseGenerator.extend({
       // Freeze whitespace in the template.
       this.opts.freezeBreaks && ( jst = freeze(jst) );
 
-    // Tweak underscore's default template delimeters
+      // Apply the template.
-    _.templateSettings = this.opts.template;
+      var eng = require( '../eng/' + opts.themeObj.engine + '-generator' );
+      var result = eng( json, jst, format, cssInfo, opts );
 
-    // Convert {{ someVar }} to {% print(filt.out(someVar) %}
+      // Unfreeze whitespace.
-    // Convert {{ someVar|someFilter }} to {% print(filt.someFilter(someVar) %}
+      this.opts.freezeBreaks && ( result = unfreeze(result) );
-    jst = jst.replace( _.templateSettings.interpolate, function replace(m, p1) {
+
-      if( p1.indexOf('|') > -1 ) {
+      return result;
-        var terms = p1.split('|');
-        return '{% print( filt.' + terms[1] + '( ' + terms[0] + ' )) %}';
-      }
-      else {
-        return '{% print( filt.out(' + p1 + ') ) %}';
     }
+
+
   });
 
-    // Strip {# comments #}
+  /**
-    jst = jst.replace( _.templateSettings.comment, '');
+  Export the TemplateGenerator function/ctor.
+  */
+  module.exports = TemplateGenerator;
 
-    // Compile and run the template. TODO: avoid unnecessary recompiles.
+  /**
-    jst = _.template(jst)({ r: json, filt: this.opts.filters, cssInfo: cssInfo, headFragment: this.opts.headFragment || '' });
+  Freeze newlines for protection against errant JST parsers.
-
+  */
-    // Unfreeze whitespace
+  function freeze( markup ) {
-    this.opts.freezeBreaks && ( jst = unfreeze(jst) );
-
-    return jst;
-  }
-
-
-});
-
-/**
-Export the TemplateGenerator function/ctor.
-*/
-module.exports = TemplateGenerator;
-
-/**
-Freeze newlines for protection against errant JST parsers.
-*/
-function freeze( markup ) {
     return markup
       .replace( _reg.regN, _defaultOpts.nSym )
       .replace( _reg.regR, _defaultOpts.rSym );
-}
+  }
 
-/**
+  /**
-Unfreeze newlines when the coast is clear.
+  Unfreeze newlines when the coast is clear.
-*/
+  */
-function unfreeze( markup ) {
+  function unfreeze( markup ) {
     return markup
       .replace( _reg.regSymR, '\r' )
       .replace( _reg.regSymN, '\n' );
-}
+  }
 
-/**
+  /**
-Regexes for linebreak preservation.
+  Regexes for linebreak preservation.
-*/
+  */
-var _reg = {
+  var _reg = {
     regN: new RegExp( '\n', 'g' ),
     regR: new RegExp( '\r', 'g' ),
     regSymN: new RegExp( _defaultOpts.nSym, 'g' ),
     regSymR: new RegExp( _defaultOpts.rSym, 'g' )
-};
+  };
+
+}());