Prepare v1.4.0 for release

aichaos · Feb 12, 2016 · 53c6393 · 53c6393
1 parent fdc33ea
commit 53c6393
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,11 @@
 # Changes
 
+* 1.4.0 2016-02-11
+  - Add support for asynchronous object macros (using promises via RSVP.js),
+    and the accompanying `replyAsync()` function and example code.
+  - Add ability to use an array in a reply element as a shortcut for random
+    text: `- (@myArray)` translates to `- {random}my|array|content{/random}`.
+
 * 1.2.1 2016-02-03
   - Fix `setSubroutine()` not accepting a function object as an argument.
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rivescript",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "RiveScript is a scripting language for chatterbots, making it easy to write trigger/response pairs for building up a bot's intelligence.",
   "keywords": [
     "bot",

diff --git a/src/rivescript.coffee b/src/rivescript.coffee
@@ -7,7 +7,7 @@
 "use strict"
 
 # Constants
-VERSION  = "1.2.1"
+VERSION  = "1.4.0"
 
 # Helper modules
 Parser  = require "./parser"
@@ -120,12 +120,12 @@ class RiveScript
   # Promise Promise
   #
   # Alias for RSVP.Promise
-  # 
+  #
   # You can use shortcut in your async subroutines
-  # 
+  #
   # ```javascript
   # rs.setSubroutine("asyncHelper", function (rs, args) {
-  #  return new rs.Promise(function (resolve, reject) { 
+  #  return new rs.Promise(function (resolve, reject) {
   #    resolve(42);
   #  });
   # });
@@ -778,7 +778,7 @@ class RiveScript
   #
   # Asyncronous version of reply. Use replyAsync if at least one of the subroutines
   # used with <call> tag returns a promise
-  # 
+  #
   # Example: using promises
   #
   # ```javascript

diff --git a/test/test-rivescript.coffee b/test/test-rivescript.coffee
@@ -435,6 +435,7 @@ exports.test_reply_arrays = (test) ->
   bot = new TestCase(test, """
     ! array greek = alpha beta gamma
     ! array test = testing trying
+    ! array format = <uppercase>|<lowercase>|<formal>|<sentence>
 
     + test random array
     - Testing (@greek) array.
@@ -450,6 +451,9 @@ exports.test_reply_arrays = (test) ->
 
     + test weird syntax
     - This (@ greek) shouldn't work, and neither should this @test.
+
+    + random format *
+    - (@format)
   """)
   bot.replyRandom("test random array", [
     "Testing alpha array.", "Testing beta array.", "Testing gamma array.",
@@ -466,6 +470,9 @@ exports.test_reply_arrays = (test) ->
     "I'm trying more beta (@arrays).", "I'm trying more gamma (@arrays)."
   ])
   bot.reply("test weird syntax", "This (@ greek) shouldn't work, and neither should this @test.")
+  bot.replyRandom("random format hello world", [
+    "HELLO WORLD", "hello world", "Hello World", "Hello world",
+  ])
   test.done()
 
 ################################################################################