From d511f8156ce8a6b4848a79c105de48a4dd9d0c4e Mon Sep 17 00:00:00 2001
From: Douglas Muth <dmuth@dmuth.org>
Date: Wed, 1 Feb 2017 21:50:33 -0500
Subject: [PATCH] Modified diceRoll() to return the raw value as well as the
 dice roll, updated unit tests, updated code that displays the dice.

---
 main.js        | 18 ++++++++++++------
 tests/tests.js | 10 +++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/main.js b/main.js
index bed8424..2251282 100644
--- a/main.js
+++ b/main.js
@@ -150,10 +150,12 @@ Diceware.getNumValuesFromNumDice = function(num_dice) {
 * Get our maximum number for a random value, turn it into base-6, 
 * then turn it into a dice roll!
 *
+* @return object An object that contains a dice roll and the raw random value.
+*
 */
 Diceware.rollDice = function(num_dice) {
 
-	var retval = [];
+	var retval = {};
 
 	var max = Diceware.getNumValuesFromNumDice(num_dice);
 
@@ -163,7 +165,8 @@ Diceware.rollDice = function(num_dice) {
 
 	var dice = Diceware.convertBase6ToDice(base6, num_dice);
 
-	retval = dice;
+	retval.value = random;
+	retval.roll = dice;
 
 	return(retval);
 
@@ -428,8 +431,11 @@ Diceware.go = function() {
 		for (var i=0; i<num_dice; i++) {
 
 			var roll = {};
-			roll.dice = Diceware.roll_dice();
-			roll.word = Diceware.get_word(wordlist, roll.dice.join(""));
+			//
+			// Roll 5 dice for 7,776 words.
+			//
+			roll.dice = Diceware.rollDice(5);
+			roll.word = Diceware.get_word(wordlist, roll.dice.value);
 			rolls.push(roll);
 			passphrase.push(roll.word);
 
@@ -452,8 +458,8 @@ Diceware.go = function() {
 			//
 			// Clone and append specific dice to this row.
 			//
-			for (key2 in roll.dice) {
-				var die = roll.dice[key2];
+			for (key2 in roll.dice.roll) {
+				var die = roll.dice.roll[key2];
 				var classname = ".source .dice" + die;
 				var tmp = jQuery(classname).clone().appendTo(row);
 			}
diff --git a/tests/tests.js b/tests/tests.js
index 30f0860..6087c74 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -79,9 +79,13 @@ QUnit.test("Roll some dice!", function(assert) {
 	assert.throws(function() {Diceware.getNumValuesFromNumDice(0); }, /zero/, "Zero");
 	assert.throws(function() {Diceware.getNumValuesFromNumDice(-1); }, /negative/, "Negative value");
 
-	assert.equal(Diceware.rollDice(1).length, 1);
-	assert.equal(Diceware.rollDice(3).length, 3);
-	assert.equal(Diceware.rollDice(8).length, 8);
+	assert.equal(Diceware.rollDice(1).roll.length, 1);
+	assert.equal(Diceware.rollDice(3).roll.length, 3);
+	assert.equal(Diceware.rollDice(8).roll.length, 8);
+
+	assert.ok(parseInt(Diceware.rollDice(1).value));
+	assert.ok(parseInt(Diceware.rollDice(3).value));
+	assert.ok(parseInt(Diceware.rollDice(8).value));
 
 	assert.throws(function() {Diceware.rollDice(0); }, /zero/, "Zero");
 	assert.throws(function() {Diceware.rollDice(-1); }, /negative/, "Negative value");