From a3ed56dd15747e60e53006df93d4240f750eab59 Mon Sep 17 00:00:00 2001
From: hacksalot <hacksalot@indevious.com>
Date: Mon, 15 Feb 2016 16:38:01 -0500
Subject: [PATCH] Update JS.

Keep dist/ updated with src/ for the CLI and require() folks.
(package.json goes off dist).
---
 dist/cli/main.js             |  4 ++--
 dist/cli/use.txt             |  1 +
 dist/core/abstract-resume.js | 35 +++++++++++++++++++++++++++++++++++
 dist/core/fresh-resume.js    | 15 +++------------
 dist/core/jrs-resume.js      | 15 +++------------
 dist/verbs/analyze.js        |  5 ++++-
 dist/verbs/build.js          |  8 ++++++--
 7 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/dist/cli/main.js b/dist/cli/main.js
index 0c7ea6f..27e4ba7 100644
--- a/dist/cli/main.js
+++ b/dist/cli/main.js
@@ -76,7 +76,7 @@ Definition of the `main` function.
       x = splitSrcDest.call(this);
       execute.call(this, x.src, x.dst, this.opts(), logMsg);
     });
-    program.command('analyze')["arguments"]('<sources...>').description('Analyze one or more resumes.').action(function(sources) {
+    program.command('analyze')["arguments"]('<sources...>').option('--private', 'Include resume fields marked as private', false).description('Analyze one or more resumes.').action(function(sources) {
       execute.call(this, sources, [], this.opts(), logMsg);
     });
     program.command('peek')["arguments"]('<sources...>').description('Peek at a resume field or section').action(function(sources, sectionOrField) {
@@ -84,7 +84,7 @@ Definition of the `main` function.
       dst = sources && sources.length > 1 ? [sources.pop()] : [];
       execute.call(this, sources, dst, this.opts(), logMsg);
     });
-    program.command('build').alias('generate').option('-t --theme <theme>', 'Theme name or path').option('-n --no-prettify', 'Disable HTML prettification', true).option('-c --css <option>', 'CSS linking / embedding').option('-p --pdf <engine>', 'PDF generation engine').option('--no-sort', 'Sort resume sections by date', false).option('--tips', 'Display theme tips and warnings.', false).description('Generate resume to multiple formats').action(function(sources, targets, options) {
+    program.command('build').alias('generate').option('-t --theme <theme>', 'Theme name or path').option('-n --no-prettify', 'Disable HTML prettification', true).option('-c --css <option>', 'CSS linking / embedding').option('-p --pdf <engine>', 'PDF generation engine').option('--no-sort', 'Sort resume sections by date', false).option('--tips', 'Display theme tips and warnings.', false).option('--private', 'Include resume fields marked as private', false).description('Generate resume to multiple formats').action(function(sources, targets, options) {
       var x;
       x = splitSrcDest.call(this);
       execute.call(this, x.src, x.dst, this.opts(), logMsg);
diff --git a/dist/cli/use.txt b/dist/cli/use.txt
index a799233..fd73d38 100644
--- a/dist/cli/use.txt
+++ b/dist/cli/use.txt
@@ -19,6 +19,7 @@ Available options:
   --format -f   The format (FRESH or JSON Resume) to use.
   --debug -d    Emit extended debugging info.
   --assert -a   Treat resume validation warnings as errors.
+  --private     Include resume fields marked as private
   --no-colors   Disable terminal colors.
   --tips        Display theme messages and tips.
   --help -h     Display help documentation.
diff --git a/dist/core/abstract-resume.js b/dist/core/abstract-resume.js
index 0d99a78..343ca78 100644
--- a/dist/core/abstract-resume.js
+++ b/dist/core/abstract-resume.js
@@ -62,6 +62,41 @@ Definition of the AbstractResume class.
       return lastDate.diff(firstDate, unit);
     };
 
+
+    /**
+    Removes ignored or private fields from a resume object
+    @returns an object with the following structure:
+    {
+      scrubbed: the processed resume object
+      ignoreList: an array of ignored nodes that were removed
+      privateList: an array of private nodes that were removed
+    }
+     */
+
+    AbstractResume.prototype.scrubResume = function(rep, opts) {
+      var ignoreList, includePrivates, privateList, scrubbed, traverse;
+      traverse = require('traverse');
+      ignoreList = [];
+      privateList = [];
+      includePrivates = (opts != null ? opts["private"] : void 0) == null ? true : opts != null ? opts["private"] : void 0;
+      scrubbed = traverse(rep).map(function(x) {
+        if (!this.isLeaf) {
+          if (this.node.ignore === true || this.node.ignore === 'true') {
+            ignoreList.push(this.node);
+            return this.remove();
+          } else if ((this.node["private"] === true || this.node["private"] === 'true') && !includePrivates) {
+            privateList.push(this.node);
+            return this.remove();
+          }
+        }
+      });
+      return {
+        scrubbed: scrubbed,
+        ingoreList: ignoreList,
+        privateList: privateList
+      };
+    };
+
     return AbstractResume;
 
   })();
diff --git a/dist/core/fresh-resume.js b/dist/core/fresh-resume.js
index e8592e2..c7d2886 100644
--- a/dist/core/fresh-resume.js
+++ b/dist/core/fresh-resume.js
@@ -77,20 +77,11 @@ Definition of the FRESHResume class.
      */
 
     FreshResume.prototype.parseJSON = function(rep, opts) {
-      var ignoreList, ref, scrubbed, that, traverse;
+      var ignoreList, privateList, ref, ref1, scrubbed, that;
       that = this;
-      traverse = require('traverse');
-      ignoreList = [];
-      scrubbed = traverse(rep).map(function(x) {
-        if (!this.isLeaf && this.node.ignore) {
-          if (this.node.ignore === true || this.node.ignore === 'true') {
-            ignoreList.push(this.node);
-            return this.remove();
-          }
-        }
-      });
+      ref = this.scrubResume(rep, opts), scrubbed = ref.scrubbed, ignoreList = ref.ignoreList, privateList = ref.privateList;
       extend(true, this, scrubbed);
-      if (!((ref = this.imp) != null ? ref.processed : void 0)) {
+      if (!((ref1 = this.imp) != null ? ref1.processed : void 0)) {
         opts = opts || {};
         if (opts.imp === void 0 || opts.imp) {
           this.imp = this.imp || {};
diff --git a/dist/core/jrs-resume.js b/dist/core/jrs-resume.js
index 304088f..5b4e5e2 100644
--- a/dist/core/jrs-resume.js
+++ b/dist/core/jrs-resume.js
@@ -71,21 +71,12 @@ Definition of the JRSResume class.
      */
 
     JRSResume.prototype.parseJSON = function(rep, opts) {
-      var ignoreList, ref, scrubbed, that, traverse;
+      var ignoreList, privateList, ref, ref1, scrubbed, that;
       opts = opts || {};
       that = this;
-      traverse = require('traverse');
-      ignoreList = [];
-      scrubbed = traverse(rep).map(function(x) {
-        if (!this.isLeaf && this.node.ignore) {
-          if (this.node.ignore === true || this.node.ignore === 'true') {
-            ignoreList.push(this.node);
-            return this.remove();
-          }
-        }
-      });
+      ref = this.scrubResume(rep, opts), scrubbed = ref.scrubbed, ignoreList = ref.ignoreList, privateList = ref.privateList;
       extend(true, this, scrubbed);
-      if (!((ref = this.imp) != null ? ref.processed : void 0)) {
+      if (!((ref1 = this.imp) != null ? ref1.processed : void 0)) {
         opts = opts || {};
         if (opts.imp === void 0 || opts.imp) {
           this.imp = this.imp || {};
diff --git a/dist/verbs/analyze.js b/dist/verbs/analyze.js
index e00b6b9..2f2d29b 100644
--- a/dist/verbs/analyze.js
+++ b/dist/verbs/analyze.js
@@ -56,7 +56,10 @@ Implementation of the 'analyze' verb for HackMyResume.
       var r;
       r = ResumeFactory.loadOne(src, {
         format: 'FRESH',
-        objectify: true
+        objectify: true,
+        inner: {
+          "private": opts["private"] === true
+        }
       }, this);
       if (opts.assert && this.hasError()) {
         return {};
diff --git a/dist/verbs/build.js b/dist/verbs/build.js
index 2220acd..7273c62 100644
--- a/dist/verbs/build.js
+++ b/dist/verbs/build.js
@@ -109,7 +109,8 @@ Implementation of the 'build' verb for HackMyResume.
       objectify: false,
       quit: true,
       inner: {
-        sort: _opts.sort
+        sort: _opts.sort,
+        "private": _opts["private"]
       }
     }, this);
     problemSheets = _.filter(sheetObjects, function(so) {
@@ -198,7 +199,9 @@ Implementation of the 'build' verb for HackMyResume.
       r: rez,
       theme: theme
     });
-    _rezObj = new RTYPES[toFormat]().parseJSON(rez);
+    _rezObj = new RTYPES[toFormat]().parseJSON(rez, {
+      "private": _opts["private"]
+    });
     targets = _expand(dst, theme);
     _.each(targets, function(t) {
       var ref;
@@ -233,6 +236,7 @@ Implementation of the 'build' verb for HackMyResume.
     var that;
     _opts.theme = (opts.theme && opts.theme.toLowerCase().trim()) || 'modern';
     _opts.prettify = opts.prettify === true;
+    _opts["private"] = opts["private"] === true;
     _opts.css = opts.css;
     _opts.pdf = opts.pdf;
     _opts.wrap = opts.wrap || 60;