Gather.

src/core/fresh-resume.js

@@ -179,6 +179,27 @@ Definition of the FRESHResume class.
     });
   };
 
+  /**
+  Return the specified network profile.
+  */
+  FreshResume.prototype.getProfile = function( socialNetwork ) {
+    socialNetwork = socialNetwork.trim().toLowerCase();
+    return this.social && _.find( this.social, function(sn) {
+      return sn.network.trim().toLowerCase() === socialNetwork
+    });
+  }
+
+  /**
+  Return an array of profiles for the specified network, for when the user
+  has multiple eg. GitHub accounts.
+  */
+  FreshResume.prototype.getProfiles = function( socialNetwork ) {
+    socialNetwork = socialNetwork.trim().toLowerCase();
+    return this.social && _.filter( this.social, function(sn){
+      return sn.network.trim().toLowerCase() === socialNetwork
+    });
+  }
+
   /**
   Determine if the sheet includes a specific skill.
   */

src/core/theme.js

@@ -149,36 +149,98 @@ Abstract theme representation.
 
   function loadExplicit() {
 
-    var formatsHash = { };
     var that = this;
+    // Set up a hash of formats supported by this theme.
+    var formatsHash = { };
 
     // Establish the base theme folder
-    var tplFolder = this.folder;//PATH.join( this.folder, 'src' );
+    var tplFolder = PATH.join( this.folder, 'src' );
 
-    // Iterate over all keys in the "formats" section of the theme JSON file.
+    var act = null;
-    // Each key will be a format (html, latex, pdf, etc) with some data.
-    Object.keys( this.formats ).forEach( function( k ) {
 
-      formatsHash[ k ] = {
+    // Iterate over all files in the theme folder, producing an array, fmts,
-        outFormat: k,
+    // containing info for each file. While we're doing that, also build up
-        files: that.formats[ k ].files.map(function(fi){
+    // the formatsHash object.
+    var fmts = RECURSIVE_READ_DIR( tplFolder ).map( function( absPath ) {
 
-          var absPath = PATH.join( tplFolder, fi );
+      act = null;
-          var pathInfo = PATH.parse( absPath );
+      // If this file is mentioned in the theme's JSON file under "transforms"
+      var pathInfo = PATH.parse(absPath);
+      var absPathSafe = absPath.trim().toLowerCase();
+      var outFmt = _.find( Object.keys( that.formats ), function( fmtKey ) {
+        var fmtVal = that.formats[ fmtKey ];
+        return _.some( fmtVal.transform, function( fpath ) {
+          var absPathB = PATH.join( that.folder, fpath ).trim().toLowerCase();
+          return absPathB === absPathSafe;
+        });
+      });
+      if( outFmt ) {
+        act = 'transform';
+      }
 
+      // If this file lives in a specific format folder within the theme,
+      // such as "/latex" or "/html", then that format is the output format
+      // for all files within the folder.
+      if( !outFmt ) {
+        var portion = pathInfo.dir.replace(tplFolder,'');
+        if( portion && portion.trim() ) {
+          var reg = /^(?:\/|\\)(html|latex|doc|pdf)(?:\/|\\)?/ig;
+          var res = reg.exec( portion );
+          res && (outFmt = res[1]);
+        }
+      }
 
-          return {
+      // Otherwise, the output format is inferred from the filename, as in
+      // compact-[outputformat].[extension], for ex, compact-pdf.html.
+      if( !outFmt ) {
+        var idx = pathInfo.name.lastIndexOf('-');
+        outFmt = ( idx === -1 ) ? pathInfo.name : pathInfo.name.substr( idx + 1 )
+      }
+
+      // We should have a valid output format now.
+      formatsHash[ outFmt ] =
+        formatsHash[outFmt] || { outFormat: outFmt, files: [] };
+
+      // Create the file representation object.
+      var obj = {
+        action: act,
+        orgPath: PATH.relative(that.folder, absPath),
         path: absPath,
         ext: pathInfo.ext.slice(1),
-            title: friendlyName( k ),
+        title: friendlyName( outFmt ),
-            pre: k,
+        pre: outFmt,
-            outFormat: k,
+        // outFormat: outFmt || pathInfo.name,
         data: FS.readFileSync( absPath, 'utf8' ),
         css: null
       };
-        })
+
-      };
+      // Add this file to the list of files for this format type.
+      formatsHash[ outFmt ].files.push( obj );
+      return obj;
     });
+
+    // Now, get all the CSS files...
+    (this.cssFiles = fmts.filter(function( fmt ){ return fmt.ext === 'css'; }))
+    .forEach(function( cssf ) {
+        // For each CSS file, get its corresponding HTML file
+        var idx = _.findIndex(fmts, function( fmt ) {
+          return fmt.pre === cssf.pre && fmt.ext === 'html'
+      });
+      fmts[ idx ].css = cssf.data;
+      fmts[ idx ].cssPath = cssf.path;
+    });
+
+    // Remove CSS files from the formats array
+    fmts = fmts.filter( function( fmt) {
+      return fmt.ext !== 'css';
+    });
+
+    // Object.keys( formatsHash ).forEach(function(k){
+    //   formatsHash[ k ].files.forEach(function(xhs){
+    //     console.log(xhs.orgPath);
+    //   });
+    // });
+
     return formatsHash;
   }
 

src/eng/underscore-generator.js

@@ -23,10 +23,10 @@ Underscore template generate for FluentCV.
     jst = jst.replace( delims.interpolate, function replace(m, p1) {
       if( p1.indexOf('|') > -1 ) {
         var terms = p1.split('|');
-        return '[~ print( filt.' + terms[1] + '( ' + terms[0] + ' )) ]]';
+        return '[~ print( filt.' + terms[1] + '( ' + terms[0] + ' )) ~]';
       }
       else {
-        return '[~ print( filt.out(' + p1 + ') ) ]]';
+        return '[~ print( filt.out(' + p1 + ') ) ~]';
       }
     });
 
@@ -34,6 +34,7 @@ Underscore template generate for FluentCV.
     jst = jst.replace( delims.comment, '');
     // Compile and run the template. TODO: avoid unnecessary recompiles.
     var compiled = _.template(jst);
+
     var ret = compiled({
       r: json,
       filt: opts.filters,

src/fluentcmd.js

@@ -4,9 +4,9 @@ Internal resume generation logic for FluentCV.
 @module fluentcmd.js
 */
 
-module.exports = function () {
+(function() {
+  module.exports = function () {
 
-  // We don't mind pseudo-globals here
     var path = require( 'path' )
       , extend = require( './utils/extend' )
       , unused = require('./utils/string')
@@ -32,7 +32,7 @@ module.exports = function () {
       _err = errHandler || error;
 
       //_opts = extend( true, _opts, opts );
-    _opts.theme = (opts.theme && opts.theme.toLowerCase().trim()) || 'modern';
+      _opts.theme = (opts.theme && opts.theme.toLowerCase().trim())|| 'modern';
       _opts.prettify = opts.prettify === true ? _opts.prettify : false;
 
       // Load input resumes...
@@ -42,15 +42,15 @@ module.exports = function () {
       // Merge input resumes...
       var msg = '';
       rez = _.reduceRight( sheets, function( a, b, idx ) {
-      msg += ((idx == sheets.length - 2) ? 'Merging '.gray + a.imp.fileName : '')
+        msg += ((idx == sheets.length - 2) ?
-        + ' onto '.gray + b.imp.fileName;
+        'Merging '.gray+ a.imp.fileName : '') + ' onto '.gray + b.imp.fileName;
         return extend( true, b, a );
       });
       msg && _log(msg);
 
       // Verify the specified theme name/path
       var relativeThemeFolder = '../node_modules/fluent-themes/themes';
-    var tFolder = PATH.resolve( __dirname, relativeThemeFolder, _opts.theme );
+      var tFolder = PATH.resolve( __dirname, relativeThemeFolder, _opts.theme);
       var exists = require('./utils/file-exists');
       if (!exists( tFolder )) {
         tFolder = PATH.resolve( _opts.theme );
@@ -62,8 +62,8 @@ module.exports = function () {
       // Load the theme
       var theTheme = new FLUENT.Theme().open( tFolder );
       _opts.themeObj = theTheme;
-    _log( 'Applying '.info + theTheme.name.toUpperCase().infoBold + (' theme (' +
+      _log( 'Applying '.info + theTheme.name.toUpperCase().infoBold +
-      Object.keys(theTheme.formats).length + ' formats)').info );
+        (' theme (' +Object.keys(theTheme.formats).length + ' formats)').info);
 
       // Expand output resumes... (can't use map() here)
       var targets = [], that = this;
@@ -82,7 +82,7 @@ module.exports = function () {
       });
 
       // Run the transformation!
-    var finished = targets.map( function(t) { return single(t, theTheme); } );
+      var finished = targets.map( function(t) { return single(t, theTheme); });
 
       // Don't send the client back empty-handed
       return { sheet: rez, targets: targets, processed: finished };
@@ -93,33 +93,49 @@ module.exports = function () {
     @param f Full path to the destination resume to generate, for example,
     "/foo/bar/resume.pdf" or "c:\foo\bar\resume.txt".
     */
-  function single( targetInfo, theme ) {
+    function single( targInfo, theme ) {
       try {
-      var f = targetInfo.file, fType = targetInfo.fmt.outFormat, fName = path.basename(f,'.'+fType);
+        var f = targInfo.file
+          , fType = targInfo.fmt.outFormat
+          , fName = path.basename(f, '.' + fType);
 
-      if( targetInfo.fmt.files && targetInfo.fmt.files.length ) {
+        // If targInfo.fmt.files exists, this theme has an explicit "files"
-        targetInfo.fmt.files.forEach( function( form ) {
+        // section in its theme.json file.
+        if( targInfo.fmt.files && targInfo.fmt.files.length ) {
 
-          if( form.ext === 'css' )
+          _log( 'Generating '.useful +
-            return;
+            targInfo.fmt.outFormat.toUpperCase().useful.bold +
-
+            ' resume: '.useful + path.relative(process.cwd(), f ).useful.bold);
-          _log( 'Generating '.useful + targetInfo.fmt.outFormat.toUpperCase().useful.bold + ' resume: '.useful +
-            path.relative(process.cwd(), f ).useful.bold );
 
             var theFormat = _fmts.filter(
-            function( fmt ) { return fmt.name === targetInfo.fmt.outFormat; })[0];
+              function(fmt) { return fmt.name === targInfo.fmt.outFormat; })[0];
-
             MKDIRP.sync( path.dirname( f ) ); // Ensure dest folder exists;
             theFormat.gen.generate( rez, f, _opts );
 
-        });
+          // targInfo.fmt.files.forEach( function( form ) {
+          //
+          //   if( form.action === 'transform' ) {
+          //     var theFormat = _fmts.filter( function( fmt ) {
+          //       return fmt.name === targInfo.fmt.outFormat;
+          //     })[0];
+          //     MKDIRP.sync( path.dirname( f ) ); // Ensure dest folder exists;
+          //     theFormat.gen.generate( rez, f, _opts );
+          //   }
+          //   else if( form.action === null ) {
+          //     // Copy the file
+          //   }
+          //
+          // });
+
         }
+        // Otherwise the theme has no files section
         else {
-        _log( 'Generating '.useful + targetInfo.fmt.outFormat.toUpperCase().useful.bold + ' resume: '.useful +
+          _log( 'Generating '.useful +
-          path.relative(process.cwd(), f ).useful.bold );
+            targInfo.fmt.outFormat.toUpperCase().useful.bold +
+            ' resume: '.useful + path.relative(process.cwd(), f ).useful.bold);
 
           var theFormat = _fmts.filter(
-          function( fmt ) { return fmt.name === targetInfo.fmt.outFormat; })[0];
+            function(fmt) { return fmt.name === targInfo.fmt.outFormat; })[0];
           MKDIRP.sync( path.dirname( f ) ); // Ensure dest folder exists;
           theFormat.gen.generate( rez, f, _opts );
         }
@@ -169,11 +185,13 @@ module.exports = function () {
           var rez = JSON.parse( rep.raw );
         }
         catch( ex ) {
-        _log('Validating '.info + rep.file.infoBold + ' against FRESH/JRS schema: '.info + 'ERROR!'.error.bold);
+          _log('Validating '.info + rep.file.infoBold +
+            ' against FRESH/JRS schema: '.info + 'ERROR!'.error.bold);
 
           if (ex instanceof SyntaxError) {
             // Invalid JSON
-          _log( '--> '.bold.red + rep.file.toUpperCase().red + ' contains invalid JSON. Unable to validate.'.red );
+            _log( '--> '.bold.red + rep.file.toUpperCase().red +
+              ' contains invalid JSON. Unable to validate.'.red );
             _log( ('    INTERNAL: ' + ex).red );
           }
           else {
@@ -189,11 +207,12 @@ module.exports = function () {
 
         try {
 
-
+          var fmt = rez.meta &&
-
+            (rez.meta.format === 'FRESH@0.1.0') ? 'fresh':'jars';
-        var fmt = rez.meta && rez.meta.format === 'FRESH@0.1.0' ? 'fresh':'jars';
           var validate = validator( schemas[ fmt ], { // Note [1]
-          formats: { date: /^\d{4}(?:-(?:0[0-9]{1}|1[0-2]{1})(?:-[0-9]{2})?)?$/ }
+            formats: {
+              date: /^\d{4}(?:-(?:0[0-9]{1}|1[0-2]{1})(?:-[0-9]{2})?)?$/
+            }
           });
 
           isValid = validate( rez );
@@ -208,15 +227,15 @@ module.exports = function () {
         }
 
         _log( 'Validating '.info + rep.file.infoBold + ' against '.info +
-        fmt.replace('jars','JSON Resume').toUpperCase().infoBold + ' schema: '.info + (isValid ? 'VALID!' : 'INVALID')[style].bold );
+          fmt.replace('jars','JSON Resume').toUpperCase().infoBold +
+          ' schema: '.info + (isValid ? 'VALID!' : 'INVALID')[style].bold );
 
-      errors.forEach(function(err,idx){
+        errors.forEach(function(err,idx) {
-        _log( '--> '.bold.yellow + ( err.field.replace('data.','resume.').toUpperCase()
+          _log( '--> '.bold.yellow +
-          + ' ' + err.message).yellow );
+            (err.field.replace('data.','resume.').toUpperCase() + ' ' +
+            err.message).yellow );
         });
 
-
-
       });
     }
 
@@ -238,7 +257,8 @@ module.exports = function () {
       sheets.forEach(function(sheet, idx){
         var sourceFormat = sheet.imp.orgFormat === 'JRS' ? 'JRS' : 'FRESH';
         var targetFormat = sourceFormat === 'JRS' ? 'FRESH' : 'JRS';
-      _log( 'Converting '.useful + sheet.imp.fileName.useful.bold + (' (' + sourceFormat + ') to ').useful + dst[0].useful.bold +
+        _log( 'Converting '.useful + sheet.imp.fileName.useful.bold + (' (' +
+          sourceFormat + ') to ').useful + dst[0].useful.bold +
           (' (' + targetFormat + ').').useful );
         sheet.saveAs( dst[idx], targetFormat );
       });
@@ -252,7 +272,8 @@ module.exports = function () {
       dst = src || ['resume.json'];
       dst.forEach( function( t ) {
         var safeFormat = opts.format.toUpperCase();
-      _log('Creating new '.useful +safeFormat.useful.bold+ ' resume: '.useful + t.useful.bold);
+        _log('Creating new '.useful +safeFormat.useful.bold+ ' resume: '.useful
+          + t.useful.bold);
         MKDIRP.sync( path.dirname( t ) ); // Ensure dest folder exists;
         FLUENT[ safeFormat + 'Resume' ].default().save( t );
       });
@@ -262,12 +283,14 @@ module.exports = function () {
     Display help documentation.
     */
     function help() {
-    console.log( FS.readFileSync( PATH.join(__dirname, 'use.txt'), 'utf8' ).useful.bold );
+      console.log( FS.readFileSync( PATH.join(__dirname, 'use.txt'), 'utf8' )
+        .useful.bold );
     }
 
     function loadSourceResumes( src, fn ) {
       return src.map( function( res ) {
-      _log( 'Reading '.info + 'SOURCE'.infoBold + ' resume: '.info + res.cyan.bold );
+        _log( 'Reading '.info + 'SOURCE'.infoBold + ' resume: '.info +
+          res.cyan.bold );
         return (fn && fn(res)) || (new FLUENT.FRESHResume()).open( res );
       });
     }
@@ -315,7 +338,9 @@ module.exports = function () {
       formats: _fmts
     };
 
-}();
+  }();
+
+}());
 
 // [1]: JSON.parse throws SyntaxError on invalid JSON. See:
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse

src/gen/template-generator.js

@@ -10,6 +10,7 @@ Template-based resume generator base for FluentCV.
     , MD = require( 'marked' )
     , XML = require( 'xml-escape' )
     , PATH = require('path')
+    , MKDIRP = require('mkdirp')
     , BaseGenerator = require( './base-generator' )
     , EXTEND = require('../utils/extend')
     , Theme = require('../core/theme');
@@ -90,6 +91,8 @@ Template-based resume generator base for FluentCV.
         }
       }
 
+      var outFolder = PATH.parse(f).dir;
+
       // Load the theme
       var theme = opts.themeObj || new Theme().open( tFolder );
 
@@ -99,20 +102,28 @@ Template-based resume generator base for FluentCV.
 
       var that = this;
       curFmt.files.forEach(function(tplInfo){
-
+        if( tplInfo.action === 'transform' ) {
           var cssInfo = { file: tplInfo.css ? tplInfo.cssPath : null, data: tplInfo.css || null };
-        // Compile and invoke the template!
           var mk = that.single( rez, tplInfo.data, that.format, cssInfo, that.opts );
           that.onBeforeSave && (mk = that.onBeforeSave( { mk: mk, theme: theme, outputFile: f } ));
-        FS.writeFileSync( f, mk, { encoding: 'utf8', flags: 'w' } );
+
+          var thisFilePath = PATH.join(outFolder, tplInfo.orgPath);
+          MKDIRP.sync( PATH.dirname(thisFilePath) );
+          console.log('Would save to ' + thisFilePath);
+
+          FS.writeFileSync( thisFilePath, mk, { encoding: 'utf8', flags: 'w' } );
+        }
       });
 
     },
 
     /**
-    Perform a single resume JSON-to-DEST resume transformation. Exists as a
+    Perform a single resume JSON-to-DEST resume transformation.
-    separate function in order to expose string-based transformations to clients
+    @param json A FRESH or JRS resume object.
-    who don't have access to filesystem resources (in-browser, etc.).
+    @param jst The stringified template data
+    @param format The format name, such as "html" or "latex"
+    @param cssInfo Needs to be refactored.
+    @param opts Options and passthrough data.
     */
     single: function( json, jst, format, cssInfo, opts ) {