move tests around

.esformatter

@@ -1,7 +1,6 @@
 {
   "plugins": [
     "esformatter-quotes",
-    "esformatter-parseint",
     "esformatter-braces",
     "esformatter-semicolons"
   ],
@@ -31,4 +30,4 @@
       "EndOfFile": 1
     }
   }
-}
+}

scratch_file.js

@@ -10,8 +10,9 @@ const nlp = require('./src/index');
 //bug 2. - gerund as nouns
 // nlp('i like running').sentences().toNegative().check();
 
-
-console.log('------');
 var m = nlp('he ate the alligator');
-// m.insertAt(2, 'fun');
-console.log(m.verbs().toPastTense().data());
+var neg = m.clone().sentences().toNegative();
+var past = m.clone().sentences().toPastTense();
+var pres = m.clone().sentences().toPresentTense();
+var adv = m.clone().verbs().insertBefore('really');
+console.log(m.out());

scripts/test.js

@@ -3,7 +3,7 @@ var tape = './node_modules/tape/bin/tape';
 var tapSpec = './node_modules/tap-spec/bin/cmd.js --color';
 
 //run tests server-side
-exec(tape + ' ./test/unit/**/*.test.js | ' + tapSpec);
+exec(tape + ' \'./test/unit/**/*.test.js\' | ' + tapSpec);
 
 //do code-coverage too
 // var nyc = './node_modules/nyc/bin/nyc.js';

src/result/index.js

@@ -1,5 +1,4 @@
 'use strict';
-const out = require('./methods/out');
 //a Text is an array of termLists
 class Text {
   constructor(arr, lexicon, reference) {
@@ -42,9 +41,6 @@ class Text {
   check(opts) {
     return out(this, 'check', opts);
   }
-  out(msg, opts) {
-    return out(this, msg, opts);
-  }
   get whitespace() {
     return {
       before: (str) => {
@@ -66,6 +62,7 @@ class Text {
 module.exports = Text;
 Text = require('./methods/loops')(Text);
 Text = require('./methods/array')(Text);
+Text = require('./methods/out')(Text);
 Text = require('./methods/termFns')(Text);
 Text = require('./methods/tag')(Text);
 Text = require('./methods/sort')(Text);

src/result/methods/loops.js

@@ -17,6 +17,9 @@ let foreach = [
   'replaceWith',
 
   'delete',
+
+// 'tag',
+// 'unTag',
 ];
 
 const addMethods = (Text) => {

src/result/methods/out/index.js

@@ -3,7 +3,7 @@ const ngram = require('./ngram');
 const edgegram = require('./edgegram');
 const topk = require('./topk');
 
-const render = {
+const methods = {
   text: (r) => {
     return r.list.reduce((str, ts) => {
       str += ts.out('text');
@@ -45,7 +45,7 @@ const render = {
   html: (r) => {
     let html = r.list.reduce((str, ts) => {
       let sentence = ts.terms.reduce((sen, t) => {
-        sen += '\n    ' + t.render.html();
+        sen += '\n    ' + t.methods.html();
         return sen;
       }, '');
       return str += '\n  <span>' + sentence + '\n  </span>';
@@ -77,38 +77,45 @@ const render = {
     return topk(r);
   }
 };
-render.plaintext = render.text;
-render.normalized = render.normal;
-render.debug = render.check;
-render.freq = render.topk;
-render.frequency = render.topk;
+methods.plaintext = methods.text;
+methods.normalized = methods.normal;
+methods.debug = methods.check;
+methods.freq = methods.topk;
+methods.frequency = methods.topk;
 
-//render/output fns
-const out = (r, fn, opts) => {
-  if (render[fn]) {
-    return render[fn](r);
-  }
-  if (fn === 'bigram') {
-    opts = opts || {
-      size: [2]
-    };
-    return ngram(r, opts);
-  }
-  if (fn === 'trigram') {
-    opts = opts || {
-      size: [3]
-    };
-    return ngram(r, opts);
-  }
-  if (fn === 'edgegram') {
-    return edgegram.both(r, opts);
-  }
-  if (fn === 'startgram') {
-    return edgegram.start(r, opts);
-  }
-  if (fn === 'endgram') {
-    return edgegram.end(r, opts);
-  }
-  return render.text(r);
+const addMethods = (Text) => {
+  Text.prototype.check = function() {
+    return methods.check(this);
+  };
+  Text.prototype.out = function(fn, opts) {
+    if (methods[fn]) {
+      return methods[fn](this);
+    }
+    if (fn === 'bigram') {
+      opts = opts || {
+        size: [2]
+      };
+      return ngram(this, opts);
+    }
+    if (fn === 'trigram') {
+      opts = opts || {
+        size: [3]
+      };
+      return ngram(this, opts);
+    }
+    if (fn === 'edgegram') {
+      return edgegram.both(this, opts);
+    }
+    if (fn === 'startgram') {
+      return edgegram.start(this, opts);
+    }
+    if (fn === 'endgram') {
+      return edgegram.end(this, opts);
+    }
+    return methods.text(this);
+  };
+  return Text;
 };
-module.exports = out;
+
+
+module.exports = addMethods;

src/result/subset/people/index.js

@@ -7,6 +7,9 @@ class People extends Text {
   data() {
     return this.list.map((ts) => ts.data());
   }
+  pronoun() {
+    return this.list.map((ts) => ts.pronoun());
+  }
   static find(r, n) {
     let people = r.clauses();
     people = people.match('#Person+');

src/result/subset/people/person.js

@@ -12,6 +12,7 @@ class Person extends Terms {
       middleName: this.middleName.out('normal'),
       lastName: this.lastName.out('normal'),
       genderGuess: this.guessGender(),
+      pronoun: this.pronoun(),
       honorifics: this.honorifics.out('array')
     };
   }
@@ -53,6 +54,16 @@ class Person extends Terms {
     //look-for regex clues
     return guessGender(this.firstName.out('normal'));
   }
+  pronoun() {
+    let g = this.guessGender();
+    if (g === 'Male') {
+      return 'he';
+    }
+    if (g === 'Female') {
+      return 'she';
+    }
+    return 'they';
+  }
   root() {
     let first = this.firstName.out('root');
     let last = this.lastName.out('root');

src/terms/methods/out.js

@@ -25,6 +25,11 @@ const methods = {
 
   html: function (ts) {
     return ts.terms.map((t) => t.render.html()).join(' ');
+  },
+  check: function(ts) {
+    ts.terms.forEach((t) => {
+      t.out('check');
+    });
   }
 };
 methods.plaintext = methods.text;
@@ -42,9 +47,7 @@ const renderMethods = (Terms) => {
   };
   //check method
   Terms.prototype.check = function () {
-    this.terms.forEach((t) => {
-      t.render.check();
-    });
+    return methods.check(this);
   };
   return Terms;
 };

test/unit/lexicon/tricky.test.js

@@ -1,17 +1,11 @@
 var test = require('tape');
 var nlp = require('../lib/nlp');
 
-
-
 var lexicon = {
   'Jardas al Abid': 'Place',
   'Umm Ar Rizam': 'Place',
   'Tobruk': 'Place'
 };
-// var sentence = 'A suicide attack hit the centre of Tobruk killing one person (and the attacker) and injuring more than twenty.';
-// var found = nlp(sentence).places().data()[0];
-// console.log('Problem#1. Test to find locality in English without lexicon.');
-// t.equal('Tobruk', found);
 
 test('find locality which has hyphenation:', function (t) {
   sentence = 'A suicide attack hit the centre of Jardas-al-Abid killing one person (and the attacker) and injuring more than twenty.';

test/unit/result/pluck.ignore.js → test/unit/match/pluck.ignore.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
+var nlp = require('../../lib/nlp');
 var terms_test = (r, arr, t) => {
   var have = r.out('array').join(' - ');
   arr = arr.join(' - ');

test/unit/result/misc.test.js → test/unit/misc.test.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
+var nlp = require('./lib/nlp');
 
 var garbage = [
   '',

test/unit/adjective/adjective.test.js → test/unit/subset/adjective/adjective.test.js

@@ -1,6 +1,6 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
-var str_test = require('../lib/fns').str_test;
+var nlp = require('../../lib/nlp');
+var str_test = require('../../lib/fns').str_test;
 
 test('==Adjective==', function (T) {
 

test/unit/adverb/adverb.test.js → test/unit/subset/adverb/adverb.test.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
+var nlp = require('../../lib/nlp');
 
 test('==Adverb==', function (T) {
 

test/unit/contractions/basic.test.js → test/unit/subset/contractions/basic.test.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
+var nlp = require('../../lib/nlp');
 
 test('basic is contractions', function(t) {
   var r = nlp(`he is cool.`);

test/unit/contractions/contractions.test.js → test/unit/subset/contractions/contractions.test.js

@@ -1,6 +1,6 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
-var str_test = require('../lib/fns').str_test;
+var nlp = require('../../lib/nlp');
+var str_test = require('../../lib/fns').str_test;
 
 test('==contractions==', function(T) {
 

test/unit/date/basic_date.ignore.js → test/unit/subset/date/basic_date.ignore.js

@@ -1,6 +1,6 @@
 var test = require('tape');
-var nlp = require('./lib/nlp');
-var str_test = require('./lib/fns').str_test;
+var nlp = require('../..b/nlp');
+var str_test = require('../..b/fns').str_test;
 
 
 test('date-parse :', function(t) {

test/unit/date/date_tag.test.js → test/unit/subset/date/date_tag.test.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
+var nlp = require('../../lib/nlp');
 
 let file = '';
 if (typeof __filename !== 'undefined') {

test/unit/date/misc.test.js → test/unit/subset/date/misc_date.test.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
+var nlp = require('../../lib/nlp');
 
 
 test('one big dates', function (t) {

test/unit/noun/article.test.js → test/unit/subset/noun/article.test.js

@@ -1,6 +1,6 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
-var str_test = require('../lib/fns').str_test;
+var nlp = require('../../lib/nlp');
+var str_test = require('../../lib/fns').str_test;
 
 test('.article():', function(t) {
   [

test/unit/noun/inflect.test.js → test/unit/subset/noun/inflect.test.js

@@ -1,6 +1,6 @@
 var test = require('tape');
-var nlp = require('../lib/nlp');
-var str_test = require('../lib/fns').str_test;
+var nlp = require('../../lib/nlp');
+var str_test = require('../../lib/fns').str_test;
 
 test('==Plurals==', function(T) {