1
0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2024-06-30 23:40:05 +01:00

Merge pull request #17 from fluentdesk/ver/0.8.0

ver/0.8.0
This commit is contained in:
JD 2015-11-18 04:56:27 -05:00
commit 8cb3e8849e
8 changed files with 119 additions and 101 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "fluentcv", "name": "fluentcv",
"version": "0.7.2", "version": "0.8.0",
"description": "Generate beautiful, targeted resumes from your command line, shell, or in Javascript with Node.js.", "description": "Generate beautiful, targeted resumes from your command line, shell, or in Javascript with Node.js.",
"repository": { "repository": {
"type": "git", "type": "git",
@ -24,7 +24,7 @@
}, },
"homepage": "https://github.com/fluentdesk/fluentcv", "homepage": "https://github.com/fluentdesk/fluentcv",
"dependencies": { "dependencies": {
"fluent-themes": "0.2.0-beta", "fluent-themes": "0.4.0-beta",
"fs-extra": "^0.24.0", "fs-extra": "^0.24.0",
"html": "0.0.10", "html": "0.0.10",
"is-my-json-valid": "^2.12.2", "is-my-json-valid": "^2.12.2",

View File

@ -39,8 +39,8 @@ Abstract character/resume sheet representation.
Save the sheet to disk (for environments that have disk access). Save the sheet to disk (for environments that have disk access).
*/ */
Sheet.prototype.save = function( filename ) { Sheet.prototype.save = function( filename ) {
filename = filename || this.meta.fileName; this.meta.fileName = filename || this.meta.fileName;
FS.writeFileSync( filename, this.stringify(), 'utf8' ); FS.writeFileSync( this.meta.fileName, this.stringify(), 'utf8' );
return this; return this;
}; };
@ -52,7 +52,7 @@ Abstract character/resume sheet representation.
function replacer( key,value ) { // Exclude these keys from stringification function replacer( key,value ) { // Exclude these keys from stringification
return _.some(['meta', 'warnings', 'computed', 'filt', 'ctrl', 'index', return _.some(['meta', 'warnings', 'computed', 'filt', 'ctrl', 'index',
'safeStartDate', 'safeEndDate', 'safeDate', 'safeReleaseDate', 'result', 'safeStartDate', 'safeEndDate', 'safeDate', 'safeReleaseDate', 'result',
'isModified', 'htmlPreview'], 'isModified', 'htmlPreview', 'display_progress_bar'],
function( val ) { return key.trim() === val; } function( val ) { return key.trim() === val; }
) ? undefined : value; ) ? undefined : value;
} }
@ -119,6 +119,7 @@ Abstract character/resume sheet representation.
delete this.publications; delete this.publications;
delete this.interests; delete this.interests;
delete this.skills; delete this.skills;
delete this.basics.profiles;
}; };
/** /**

View File

@ -31,6 +31,11 @@ Abstract theme representation.
return friendly[val] || val; return friendly[val] || val;
} }
// Remember the theme folder; might be custom
this.folder = themeFolder;
// Iterate over all files in the theme folder, producing an array, fmts,
// containing info for each file.
var tplFolder = PATH.join( themeFolder, 'templates' ); var tplFolder = PATH.join( themeFolder, 'templates' );
var fmts = FS.readdirSync( tplFolder ).map( function( file ) { var fmts = FS.readdirSync( tplFolder ).map( function( file ) {
var absPath = PATH.join( tplFolder, file ); var absPath = PATH.join( tplFolder, file );
@ -46,20 +51,24 @@ Abstract theme representation.
return temp; return temp;
}); });
// Freebie formats every theme gets // Add freebie formats every theme gets
fmts.push( [ 'json', { title: 'json', pre: 'json', ext: 'json', path: null, data: null } ] ); fmts.push( [ 'json', { title: 'json', pre: 'json', ext: 'json', path: null, data: null } ] );
fmts.push( [ 'yml', { title: 'yaml', pre: 'yml', ext: 'yml', path: null, data: null } ] ); fmts.push( [ 'yml', { title: 'yaml', pre: 'yml', ext: 'yml', path: null, data: null } ] );
// Handle CSS files // Now, get all the CSS files...
var cssFiles = fmts.filter(function( fmt ){ this.cssFiles = fmts.filter(function( fmt ){ return fmt[1].ext === 'css'; });
return fmt[1].ext === 'css';
}); // ...and assemble information on them
cssFiles.forEach(function( cssf ) { this.cssFiles.forEach(function( cssf ) {
// For each CSS file, get its corresponding HTML file // For each CSS file, get its corresponding HTML file
var idx = _.findIndex(fmts, function( fmt ) { return fmt[1].pre === cssf[1].pre && fmt[1].ext === 'html' }); var idx = _.findIndex(fmts, function( fmt ) {
return fmt[1].pre === cssf[1].pre && fmt[1].ext === 'html'
});
fmts[ idx ][1].css = cssf[1].data; fmts[ idx ][1].css = cssf[1].data;
fmts[ idx ][1].cssPath = cssf[1].path; fmts[ idx ][1].cssPath = cssf[1].path;
}); });
// Remove CSS files from the formats array
fmts = fmts.filter( function( fmt) { fmts = fmts.filter( function( fmt) {
return fmt[1].ext !== 'css'; return fmt[1].ext !== 'css';
}); });
@ -67,7 +76,9 @@ Abstract theme representation.
// Create a hash out of the formats for this theme // Create a hash out of the formats for this theme
this.formats = _.object( fmts ); this.formats = _.object( fmts );
// Set the official theme name
this.name = PATH.parse( themeFolder ).name; this.name = PATH.parse( themeFolder ).name;
return this; return this;
}; };

View File

@ -123,7 +123,7 @@ module.exports = function () {
]; ];
/** /**
Default FluentCMD options. Default FluentCV options.
*/ */
var _opts = { var _opts = {
theme: 'modern', theme: 'modern',

View File

@ -6,6 +6,7 @@ Core resume generation module for FluentCV.
module.exports = { module.exports = {
Sheet: require('./core/sheet'), Sheet: require('./core/sheet'),
Theme: require('./core/theme'), Theme: require('./core/theme'),
FluentDate: require('./core/fluent-date'),
HtmlGenerator: require('./gen/html-generator'), HtmlGenerator: require('./gen/html-generator'),
TextGenerator: require('./gen/text-generator'), TextGenerator: require('./gen/text-generator'),
HtmlPdfGenerator: require('./gen/html-pdf-generator'), HtmlPdfGenerator: require('./gen/html-pdf-generator'),

View File

@ -1,32 +1,40 @@
/** /**
HTML resume generator for FluentCV. HTML resume generator for FluentCV.
@license Copyright (c) 2015 by James M. Devlin. All rights reserved. @license Copyright (c) 2015 James M. Devlin / FluentDesk
*/ */
var TemplateGenerator = require('./template-generator'); (function() {
var FS = require('fs-extra');
var HTML = require( 'html' );
var HtmlGenerator = module.exports = TemplateGenerator.extend({ var TemplateGenerator = require('./template-generator')
, FS = require('fs-extra')
, HTML = require( 'html' )
, PATH = require('path');
init: function() { var HtmlGenerator = module.exports = TemplateGenerator.extend({
this._super( 'html' );
},
/** init: function() {
Generate an HTML resume with optional pretty printing. this._super( 'html' );
*/ },
onBeforeSave: function( mk, theme, outputFile ) {
var themeFile = theme.getFormat('html').path;
var cssSrc = themeFile.replace( /.html$/g, '.css' );
var cssDst = outputFile.replace( /.html$/g, '.css' );
var that = this;
FS.copySync( cssSrc, cssDst, { clobber: true }, function( e ) {
throw { fluenterror: that.codes.copyCss, data: [cssSrc,cssDst] };
});
return this.opts.prettify ? /**
HTML.prettyPrint( mk, this.opts.prettify ) : mk; Copy satellite CSS files to the destination and optionally pretty-print
} the HTML resume prior to saving.
*/
onBeforeSave: function( info ) {
var cssSrc = PATH.join( info.theme.folder, 'templates', '*.css' )
, outFolder = PATH.parse( info.outputFile ).dir, that = this;
}); info.theme.cssFiles.forEach( function( f ) {
var fi = PATH.parse( f[1].path );
FS.copySync( f[1].path, PATH.join( outFolder, fi.base ), { clobber: true }, function( e ) {
throw { fluenterror: that.codes.copyCss, data: [cssSrc,cssDst] };
});
});
return this.opts.prettify ?
HTML.prettyPrint( info.mk, this.opts.prettify ) : info.mk;
}
});
}());

View File

@ -1,74 +1,71 @@
/** /**
HTML-based PDF resume generator for FluentCV. Definition of the HtmlPdfGenerator class.
@license Copyright (c) 2015 by James M. Devlin. All rights reserved. @license Copyright (c) 2015 James M. Devlin / FluentDesk
*/ */
var TemplateGenerator = require('./template-generator'); (function() {
var FS = require('fs-extra');
var HTML = require( 'html' );
var HtmlPdfGenerator = module.exports = TemplateGenerator.extend({ var TemplateGenerator = require('./template-generator')
, FS = require('fs-extra')
init: function() { , HTML = require( 'html' );
this._super( 'pdf', 'html' );
},
/** /**
Generate an HTML resume with optional pretty printing. An HTML-based PDF resume generator for FluentCV.
TODO: Avoid copying the CSS file to dest if we don't need to.
*/ */
onBeforeSave: function( mk, themeFile, outputFile ) { var HtmlPdfGenerator = module.exports = TemplateGenerator.extend({
// var cssSrc = themeFile.replace( /pdf\.html$/gi, 'html.css' );
// var cssDst = outputFile.replace( /\.pdf$/gi, '.css' );
// var that = this;
// FS.copySync( cssSrc, cssDst, { clobber: true }, function( e ) {
// if( e ) that.err( "Couldn't copy CSS file to destination: " + e);
// });
// return true ?
// HTML.prettyPrint( mk, { indent_size: 2 } ) : mk;
pdf(mk, outputFile); init: function() {
return mk; this._super( 'pdf', 'html' );
} },
}); /**
Generate the binary PDF.
/** */
Generate a PDF from HTML. onBeforeSave: function( info ) {
*/ pdf(info.mk, info.outputFile);
function pdf( markup, fOut ) { return info.mk;
var pdfCount = 0;
if( false ) { //( _opts.pdf === 'phantom' || _opts.pdf == 'all' ) {
pdfCount++;
require('phantom').create( function( ph ) {
ph.createPage( function( page ) {
page.setContent( markup );
page.set('paperSize', {
format: 'A4',
orientation: 'portrait',
margin: '1cm'
});
page.set("viewportSize", {
width: 1024, // TODO: option-ify
height: 768 // TODO: Use "A" sizes
});
page.set('onLoadFinished', function(success) {
page.render( fOut );
pdfCount++;
ph.exit();
});
},
{ dnodeOpts: { weak: false } } );
});
}
if( true ) { // _opts.pdf === 'wkhtmltopdf' || _opts.pdf == 'all' ) {
var fOut2 = fOut;
if( pdfCount == 1 ) {
fOut2 = fOut2.replace(/\.pdf$/g, '.b.pdf');
} }
require('wkhtmltopdf')( markup, { pageSize: 'letter' } )
.pipe( FS.createWriteStream( fOut2 ) ); });
/**
Generate a PDF from HTML.
*/
function pdf( markup, fOut ) {
var pdfCount = 0;
if( false ) { //( _opts.pdf === 'phantom' || _opts.pdf == 'all' ) {
pdfCount++; pdfCount++;
require('phantom').create( function( ph ) {
ph.createPage( function( page ) {
page.setContent( markup );
page.set('paperSize', {
format: 'A4',
orientation: 'portrait',
margin: '1cm'
});
page.set("viewportSize", {
width: 1024, // TODO: option-ify
height: 768 // TODO: Use "A" sizes
});
page.set('onLoadFinished', function(success) {
page.render( fOut );
pdfCount++;
ph.exit();
});
},
{ dnodeOpts: { weak: false } } );
});
}
if( true ) { // _opts.pdf === 'wkhtmltopdf' || _opts.pdf == 'all' ) {
var fOut2 = fOut;
if( pdfCount == 1 ) {
fOut2 = fOut2.replace(/\.pdf$/g, '.b.pdf');
}
require('wkhtmltopdf')( markup, { pageSize: 'letter' } )
.pipe( FS.createWriteStream( fOut2 ) );
pdfCount++;
}
} }
}
}());

View File

@ -89,11 +89,11 @@ var TemplateGenerator = module.exports = BaseGenerator.extend({
// Load theme and CSS data // Load theme and CSS data
var tplFolder = PATH.join( tFolder, 'templates' ); var tplFolder = PATH.join( tFolder, 'templates' );
var curFmt = theme.getFormat( this.format ); var curFmt = theme.getFormat( this.format );
var ctx = { file: curFmt.css ? curFmt.cssPath : null, data: curFmt.css || null }; var cssInfo = { file: curFmt.css ? curFmt.cssPath : null, data: curFmt.css || null };
// Compile and invoke the template! // Compile and invoke the template!
var mk = this.single( rez, curFmt.data, this.format, ctx, opts ); var mk = this.single( rez, curFmt.data, this.format, cssInfo, opts );
this.onBeforeSave && (mk = this.onBeforeSave( mk, theme, f )); this.onBeforeSave && (mk = this.onBeforeSave( { mk: mk, theme: theme, outputFile: f } ));
FS.writeFileSync( f, mk, { encoding: 'utf8', flags: 'w' } ); FS.writeFileSync( f, mk, { encoding: 'utf8', flags: 'w' } );
}, },