Refactor and add coverage

Author: lgaticaq

.node-version

@@ -1,2 +1,5 @@
 node_modules
-src
+test
+coverage
+LICENSE
+.*

.npmignore

@@ -1 +1 @@
-v5
+v6

.nvmrc

@@ -1,7 +1,9 @@
 language: node_js
 node_js:
-  - "0.12"
   - "4"
   - "5"
+  - "6"
 notifications:
   email: false
+after_success:
+  - npm run coveralls

.travis.yml

@@ -1,14 +1,21 @@
-Copyright (c) 2015, Password.diet <>
+The MIT License (MIT)
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+Copyright (c) 2016 Leonardo Gatica
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -3,6 +3,7 @@
 [![npm version](https://img.shields.io/npm/v/diceware-generator.svg?style=flat-square)](https://www.npmjs.com/package/diceware-generator)
 [![npm downloads](https://img.shields.io/npm/dm/diceware-generator.svg?style=flat-square)](https://www.npmjs.com/package/diceware-generator)
 [![Build Status](https://img.shields.io/travis/lgaticaq/diceware-generator.svg?style=flat-square)](https://travis-ci.org/lgaticaq/diceware-generator)
+[![Coverage Status](https://img.shields.io/coveralls/lgaticaq/diceware-generator/master.svg?style=flat-square)](https://coveralls.io/github/lgaticaq/diceware-generator?branch=master)
 [![dependency Status](https://img.shields.io/david/lgaticaq/diceware-generator.svg?style=flat-square)](https://david-dm.org/lgaticaq/diceware-generator#info=dependencies)
 [![devDependency Status](https://img.shields.io/david/dev/lgaticaq/diceware-generator.svg?style=flat-square)](https://david-dm.org/lgaticaq/diceware-generator#info=devDependencies)
 [![Join the chat at https://gitter.im/lgaticaq/diceware-generator](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg?style=flat-square)](https://gitter.im/lgaticaq/diceware-generator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

README.md

@@ -2,30 +2,26 @@
   "name": "diceware-generator",
   "version": "1.2.2",
   "description": "A diceware generator",
-  "main": "dist",
+  "main": "src",
   "scripts": {
-    "prebuild": "npm run lint -s && npm run clean -s",
-    "build": "babel src --out-dir dist --source-maps",
-    "lint": "eslint src",
-    "clean": "rimraf dist",
-    "prepublish": "npm run test -s",
-    "pretest": "npm run build -s",
-    "test": "mocha --compilers js:babel-core/register"
+    "pretest": "eslint src",
+    "test": "istanbul cover _mocha",
+    "coveralls": "coveralls < coverage/lcov.info"
+  },
+  "engines": {
+    "node": ">=4"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lgaticaq/diceware-generator.git"
   },
-  "engines": {
-    "node": ">=0.12"
-  },
   "keywords": [
     "diceware",
     "password",
     "generator"
   ],
   "author": "Leonardo Gatica <[email protected]> (https://about.me/lgatica)",
-  "license": "ISC",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/lgaticaq/diceware-generator/issues"
   },
@@ -35,52 +31,42 @@
     "diceware-wordlist-jp": "^1.0.1",
     "diceware-wordlist-sp": "^1.0.0",
     "diceware-wordlist-swe": "^1.0.1",
-    "lodash": "^4.0.0",
+    "lodash": "^4.12.0",
     "secure-random": "^1.1.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.4.0",
-    "babel-core": "^6.4.0",
-    "babel-preset-es2015": "^6.3.13",
-    "chai": "^3.4.1",
+    "chai": "^3.5.0",
+    "coveralls": "^2.11.9",
     "eslint": "^2.10.1",
-    "js-combinatorics": "^0.5.0",
-    "mocha": "^2.3.4",
-    "rimraf": "^2.5.0"
+    "istanbul": "^0.4.3",
+    "js-combinatorics": "^0.5.2",
+    "mocha": "^2.4.5"
   },
   "eslintConfig": {
+    "env": {
+      "es6": true,
+      "node": true,
+      "mocha": true
+    },
+    "extends": "eslint:recommended",
     "rules": {
       "indent": [
         2,
         2
       ],
-      "quotes": [
-        2,
-        "single"
-      ],
       "linebreak-style": [
         2,
         "unix"
       ],
+      "quotes": [
+        2,
+        "single"
+      ],
       "semi": [
         2,
         "always"
       ]
-    },
-    "ecmaFeatures": {
-      "modules": true
-    },
-    "env": {
-      "es6": true,
-      "node": true,
-      "mocha": true
-    },
-    "extends": "eslint:recommended"
-  },
-  "babel": {
-    "presets": [
-      "es2015"
-    ]
+    }
   },
   "tonicExampleFilename": "example.js"
 }

package.json

@@ -1,5 +1,7 @@
-import secureRandom from 'secure-random';
-import {assign, includes, range} from 'lodash';
+'use strict';
+
+const secureRandom = require('secure-random');
+const _ = require('lodash');
 
 const dw = {
   en: require('diceware-wordlist-en'),
@@ -20,22 +22,22 @@ const getRandomInt = (min, max) => {
 
 const diceRoll = () => getRandomInt(1, 6);
 
-const diceSeq = (count) => range(count).map(() => diceRoll()).join('');
+const diceSeq = count => _.range(count).map(() => diceRoll()).join('');
 
 const getDices = () => diceSeq(5);
 
-const getRandomWord = (language) => dw[language][getDices()];
+const getRandomWord = language => dw[language][getDices()];
 
-const getRandomPassword = (options) => {
-  options = assign({
+const getRandomPassword = options => {
+  options = _.assign({
     'language': 'en',
     'wordcount': 6,
     'format': 'string'
   }, options);
-  if (!includes(['en', 'swe', 'jp', 'sp'], options.language)) {
+  if (!_.includes(['en', 'swe', 'jp', 'sp'], options.language)) {
     throw(new Error(`Unsupported language: ${options.language}`));
   }
-  const words = range(options.wordcount).map(() => getRandomWord(options.language));
+  const words = _.range(options.wordcount).map(() => getRandomWord(options.language));
   return (options.format === 'array') ? words : words.join(' ');
 };
 

src/index.js

@@ -1,57 +1,59 @@
-import {expect} from 'chai';
-import dwGen from '../src';
+'use strict';
 
-describe('wordlist', function() {
-  it('should return a string by default', function() {
+const expect = require('chai').expect;
+const dwGen = require('../src');
+
+describe('wordlist', () => {
+  it('should return a string by default', () => {
     expect(dwGen()).to.be.a('string');
   });
 
-  it('should return 6 words by default', function() {
+  it('should return 6 words by default', () => {
     expect(dwGen().split(' ').length).to.equal(6);
   });
 
-  it('should return an array if requested', function() {
+  it('should return an array if requested', () => {
     expect(dwGen({'format': 'array'})).to.be.a('array');
   });
 
-  it('should return an 6 item array in array mode by default', function() {
+  it('should return an 6 item array in array mode by default', () => {
     expect(dwGen({'format': 'array'}).length).to.equal(6);
   });
 
-  it('should obey requested length in string mode', function() {
+  it('should obey requested length in string mode', () => {
     expect(dwGen({'wordcount': 11}).split(' ').length).to.equal(11);
   });
 
-  it('should obey requested length in array mode', function() {
+  it('should obey requested length in array mode', () => {
     expect(dwGen({'format': 'array', 'wordcount': 11}).length).to.equal(11);
   });
 
-  it('should support en', function() {
-    expect(function() {
+  it('should support en', () => {
+    expect(() => {
       dwGen({'language': 'en'});
     }).to.not.throw(Error);
   });
 
-  it('should support jp', function() {
-    expect(function() {
+  it('should support jp', () => {
+    expect(() => {
       dwGen({'language': 'jp'});
     }).to.not.throw(Error);
   });
 
-  it('should support swe', function() {
-    expect(function() {
+  it('should support swe', () => {
+    expect(() => {
       dwGen({'language': 'swe'});
     }).to.not.throw(Error);
   });
 
-  it('should support sp', function() {
-    expect(function() {
+  it('should support sp', () => {
+    expect(() => {
       dwGen({'language': 'sp'});
     }).to.not.throw(Error);
   });
 
-  it('should throw an error if asked for an unsupported language', function() {
-    expect(function() {
+  it('should throw an error if asked for an unsupported language', () => {
+    expect(() => {
       dwGen({'language': 'bogusTalk'});
     }).to.throw(Error);
   });