Merge pull request aichaos#62 from Dinh-Hung-Tu/whitespace_removal

kirsle · web-flow · commit b47f37c1f724 · 2016-12-09T15:13:53.000-08:00
fix format message with multiple whitespaces
diff --git a/rivescript/brain.py b/rivescript/brain.py
@@ -136,7 +136,8 @@ def format_message(self, msg, botreply=False):
         else:
             # For everything else, strip all non-alphanumerics.
             msg = utils.strip_nasties(msg)
-
+            msg = msg.strip() # Strip leading and trailing white space
+            msg = RE.ws.sub(" ",msg) # Replace the multiple whitespaces by single whitespace
         return msg
 
     def _getreply(self, user, msg, context='normal', step=0, ignore_object_errors=True):
diff --git a/tests/test_format_message.py b/tests/test_format_message.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals, absolute_import
+
+from .config import RiveScriptTestCase
+
+class MessageFormatTests(RiveScriptTestCase):
+    """Test format message."""
+    def test_format_message(self):
+        self.new("""
+            + hello bot
+            - hello human
+        """)
+        self.reply("hello bot", "hello human")
+        self.reply("Hello Bot", "hello human")
+        self.reply("  hello bot   ", "hello human") # Strip leading and trailing whitespaces
+        self.reply("  hello   bot   ", "hello human") # Replace the multiple whitespaces by single whitespace
+        self.reply("hello      bot!!!???   ", "hello human") # Strip nasties
