Merge branch 'develop'

Author: ssoloff

.travis.yml

@@ -2,7 +2,7 @@ dist: trusty
 sudo: false
 language: node_js
 node_js:
-- 6.9.4
+- 6.9.5
 addons:
   apt:
     sources:

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [1.0.0] - 2017-02-05
+- First official release.
+
+[Unreleased]: https://github.com/ssoloff/dice-server-js/compare/v1.0.0...HEAD

README.md

@@ -1,17 +1,31 @@
-# dice-server-js
+# Dice Server JS
 
 [![Build Status][travis-image]][travis-link]
 [![Coverage Status][coveralls-image]][coveralls-link]
-[![Node Dependency Status][david-image]][david-link]
-[![Node Dev Dependency Status][david-dev-image]][david-dev-link]
+[![Dependency Status][david-image]][david-link]
+[![Dev Dependency Status][david-dev-image]][david-dev-link]
 
-Server for parsing and executing dice notation.
+A server for parsing and evaluating dice notation.
+
+## Usage
+
+* Stable version: https://dice-server-js.herokuapp.com
+* Latest development version: https://dice-server-js-staging.herokuapp.com
+
+DSJS provides a basic client for evaluating standard dice notation.  Instructions for using this client, as well as the supported dice notation grammar, are available on the [wiki](https://github.com/ssoloff/dice-server-js/wiki/Client-help).
+
+DSJS also provides an [API](https://github.com/ssoloff/dice-server-js/wiki/API) that can be used by third parties to implement a secure dice rolling service between game masters and players.
+
+## License
+
+Licensed under the terms of the [MIT License][license-link].
 
 [coveralls-image]: https://coveralls.io/repos/ssoloff/dice-server-js/badge.svg?branch=master&service=github
 [coveralls-link]: https://coveralls.io/github/ssoloff/dice-server-js?branch=master
 [david-image]: https://david-dm.org/ssoloff/dice-server-js.svg
 [david-link]: https://david-dm.org/ssoloff/dice-server-js
 [david-dev-image]: https://david-dm.org/ssoloff/dice-server-js/dev-status.svg
 [david-dev-link]: https://david-dm.org/ssoloff/dice-server-js#info=devDependencies
+[license-link]: https://opensource.org/licenses/MIT
 [travis-image]: https://travis-ci.org/ssoloff/dice-server-js.svg?branch=master
 [travis-link]: https://travis-ci.org/ssoloff/dice-server-js

features/client/support/home-page.js

@@ -40,8 +40,6 @@ const Locators = {
 
   expressionText: () => By.id('main-eval-expressionText'),
 
-  help: () => By.id('main-eval-help'),
-
   randomNumberGeneratorJson: () => By.id('main-eval-randomNumberGeneratorJson'),
 
   reevaluateExpressionResult: () => By.name('reevaluate'),
@@ -52,9 +50,7 @@ const Locators = {
 
   requestId: () => By.id('main-eval-requestId'),
 
-  roundingMode: (roundingMode) => By.id(`main-eval-roundingMode${roundingMode}`),
-
-  toggleHelp: () => By.id('main-eval-toggleHelp')
+  roundingMode: (roundingMode) => By.id(`main-eval-roundingMode${roundingMode}`)
 }
 
 class HomePage {
@@ -106,18 +102,10 @@ class HomePage {
       .getText()
   }
 
-  getHelpLinkText () {
-    return this.driver.findElement(Locators.toggleHelp()).getText()
-  }
-
   isErrorMessageDisplayed () {
     return this.driver.findElement(Locators.errorMessage()).isDisplayed()
   }
 
-  isHelpDisplayed () {
-    return this.driver.findElement(Locators.help()).isDisplayed()
-  }
-
   open () {
     return this.driver.get(`${config.baseUri}/`)
   }
@@ -156,11 +144,6 @@ class HomePage {
     return this.driver.findElement(Locators.roundingMode(roundingMode)).click()
   }
 
-  toggleHelp () {
-    return this._wait(until.elementsLocated(Locators.toggleHelp()))
-      .then((elements) => elements[0].click())
-  }
-
   typeEnter () {
     return this.typeExpressionText(Key.ENTER)
   }

features/client/ui/offering_help.feature

@@ -53,10 +53,6 @@ module.exports = function () {
     }
   )
 
-  this.When(/^the(?: hide)? help link is clicked$/, function () {
-    return this.homePage.toggleHelp()
-  })
-
   this.When(/^the reevaluate button on the (\d+)(?:st|nd|rd|th) row is clicked$/, function (row) {
     this.resultRowCount += 1
     return this.homePage.reevaluateResultAtRow(row)
@@ -92,14 +88,6 @@ module.exports = function () {
     )
   })
 
-  this.Then(/^help should( not)? be displayed$/, function (shouldNotBeDisplayed) {
-    const shouldBeDisplayed = !shouldNotBeDisplayed
-    return this.homePage.awaitUntil(() =>
-      this.homePage.isHelpDisplayed()
-        .then((displayed) => expect(displayed).to.be[shouldBeDisplayed ? 'true' : 'false'])
-    )
-  })
-
   this.Then(
     /^the(?: (\d+)(?:st|nd|rd|th))? expression canonical text should be "(.*)"$/,
     function (row, expressionCanonicalText) {
@@ -137,13 +125,6 @@ module.exports = function () {
     }
   )
 
-  this.Then(/^the help link text should be "(.*)"$/, function (helpLinkText) {
-    return this.homePage.awaitUntil(() =>
-      this.homePage.getHelpLinkText()
-        .then((text) => expect(text).to.equal(helpLinkText))
-    )
-  })
-
   this.Then(/^the results table should be empty$/, function () {
     return this.homePage.awaitUntil(() =>
       this.homePage.getExpressionResultCount()