diff --git a/src/scrappy.js b/src/scrappy.js index 5f8dc48..c55b67e 100644 --- a/src/scrappy.js +++ b/src/scrappy.js @@ -54,14 +54,14 @@ module.exports = function () { // Merge input resumes rez = sheets.reduce( function( acc, elem ) { - return extend(true, acc.rep, elem.rep); + return extend( true, acc.rep, elem.rep ); }); // Run the transformation! var finished = targets.map( gen ); return { - sheet: rez.rep, + sheet: rez,//.rep, targets: targets, processed: finished }; @@ -80,7 +80,7 @@ module.exports = function () { var fName = path.basename( f, '.' + fType ); // Get the format object (if any) corresponding to that type, and assemble - // thefinal output file path for the generated resume. + // the final output file path for the generated resume. var fObj = _fmts.filter( function(_f) { return _f.name === fType; } )[0]; var fOut = path.join( f.substring( 0, f.lastIndexOf('.') + 1 ) + fObj.ext ); console.log( 'Generating ' + fType.toUpperCase() + ' resume: ' + fOut ); diff --git a/src/sheet.js b/src/sheet.js index e173837..628c39f 100644 --- a/src/sheet.js +++ b/src/sheet.js @@ -6,6 +6,7 @@ Abstract character/resume sheet representation. (function() { var FS = require('fs'); + var extend = require('./extend'); function Sheet() { this.id = null; @@ -15,9 +16,11 @@ Abstract character/resume sheet representation. } Sheet.prototype.open = function( file, title ) { - this.rep = JSON.parse( FS.readFileSync( file, 'utf8' ) ); + var rep = JSON.parse( FS.readFileSync( file, 'utf8' ) ); + extend( true, this, rep ); + console.log( this ); this.fileName = file; - this.title = title || this.rep.basics.name; + this.title = title || this.basics.name; return this; };