Added tests and converted dictionary key generator to es6

lib/key_generators/dictionary.js

@@ -1,24 +1,32 @@
-var fs = require('fs');
+const fs = require('fs');
 
-var DictionaryGenerator = function(options) {
+module.exports = class DictionaryGenerator {
-  //Options
+
+  constructor(options, readyCallback) {
+    // Check options format
     if (!options)      throw Error('No options passed to generator');
     if (!options.path) throw Error('No dictionary path specified in options');
 
     // Load dictionary
     fs.readFile(options.path, 'utf8', (err, data) => {
       if (err) throw err;
+
       this.dictionary = data.split(/[\n\r]+/);
+
+      if (readyCallback) readyCallback();
     });
-};
+  }
 
   // Generates a dictionary-based key, of keyLength words
-DictionaryGenerator.prototype.createKey = function(keyLength) {
+  createKey(keyLength) {
-  var text = '';
+    let text = '';
-  for(var i = 0; i < keyLength; i++)
+
-    text += this.dictionary[Math.floor(Math.random() * this.dictionary.length)];
+    for (let i = 0; i < keyLength; i++) {
+      const index = Math.floor(Math.random() * this.dictionary.length);
+      text += this.dictionary[index];
+    }
 
     return text;
-};
+  }
 
-module.exports = DictionaryGenerator;
+};

test/key_generators/dictionary_spec.js

@@ -0,0 +1,33 @@
+/* global describe, it */
+
+const assert = require('assert');
+
+const fs = require('fs');
+
+const Generator = require('../../lib/key_generators/dictionary');
+
+describe('RandomKeyGenerator', function() {
+  describe('randomKey', function() {
+    it('should throw an error if given no options', () => {
+      assert.throws(() => {
+        new Generator();
+      }, Error);
+    });
+
+    it('should throw an error if given no path', () => {
+      assert.throws(() => {
+        new Generator({});
+      }, Error);
+    });
+
+    it('should return a key of the proper number of words from the given dictionary', () => {
+      const path = '/tmp/haste-server-test-dictionary';
+      const words = ['cat'];
+      fs.writeFileSync(path, words.join('\n'));
+
+      const gen = new Generator({path}, () => {
+        assert.equal('catcatcat', gen.createKey(3));
+      });
+    });
+  });
+});