fix: minor fixes for name redaction

solvvy · Dec 20, 2017 · 46d26f0 · 46d26f0
1 parent 5156a5f
commit 46d26f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/patterns.js b/lib/patterns.js
@@ -8,7 +8,7 @@ var closingRegex = /(thx|thanks|thank you|regards|best|[a-z]+ly|[a-z]+ regards|a
 var newlineRegex = /([\n\f\r-]+\s*)/gi;
 
 module.exports = {
-  greetOrClose: new RegExp(`(((${greetingRegex.source})|(${closingRegex.source}[,.!]?))[\\s-]+)`, 'gi'),
+  greetOrClose: new RegExp(`(((${greetingRegex.source})|(${closingRegex.source}\\s*[,.!]*))[\\s-]*)`, 'gi'),
   nameGeneric: new RegExp(`( ?(([A-Z][a-z]+)|([A-Z]\\.)))+([,.]|[,.]?$)`, 'gm'),
   names: new RegExp(`${newlineRegex.source}( ?(${names.join('|')}))+`, 'gi'),
   creditCardNumber: /\d{4}[ -]?\d{4}[ -]?\d{4}[ -]?\d{4}|\d{4}[ -]?\d{6}[ -]?\d{4}\d?/g,

diff --git a/test/index.test.js b/test/index.test.js
@@ -30,6 +30,8 @@ defineTest('index.js', function (Redactor) {
   });
 
   it('should replace names', function () {
+    redactor.redact('blah blah\n\nThank you ..Risemamy McCrubben').should.equal('blah blah\n\nThank you ..NAME');;
+    redactor.redact('blah blah. Thanks -Jon').should.equal('blah blah. Thanks -NAME');;
     redactor.redact('here\'s my Cliff. blah blah').should.equal('here\'s my Cliff. blah blah');
     redactor.redact('here\'s my Clifford. blah blah').should.equal('here\'s my Clifford. blah blah');
     redactor.redact('Dear Clifford,\n blah blah').should.equal('Dear NAME,\n blah blah');