Issue 82 replace regex match by regex search for detection in the middle of the string

hungtu · hungtu · commit 94885826e1d4 · 2017-02-15T18:24:13.000+01:00
diff --git a/rivescript/parser.py b/rivescript/parser.py
@@ -535,13 +535,13 @@ def check_syntax(self, cmd, line):
             if parts[0] == "begin" and len(parts) > 1:
                 return "The 'begin' label takes no additional arguments, should be verbatim '> begin'"
             elif parts[0] == "topic":
-                match = re.match(RE.name_syntax, line)
-                if match:
+                search = re.search(RE.name_syntax, line)
+                if search:
                     return "Topics should be lowercased and contain only numbers and letters"
             elif parts[0] == "object":
-                match = re.match(RE.name_syntax, line)
-                if match:
-                    return "Objects can only contain numbers and letters"
+                search = re.search(RE.name_syntax, line)
+                if search:
+                    return "Objects can only contain numbers and letters"  # TODO Acceptance of uppercase letter?
         elif cmd == '+' or cmd == '%' or cmd == '@':
             # + Trigger, % Previous, @ Redirect
             #   This one is strict. The triggers are to be run through the regexp engine,
@@ -585,12 +585,12 @@ def check_syntax(self, cmd, line):
 
             # In UTF-8 mode, most symbols are allowed.
             if self.utf8:
-                match = re.match(RE.utf8_trig, line)
-                if match:
+                search = re.search(RE.utf8_trig, line)
+                if search:
                     return "Triggers can't contain uppercase letters, backslashes or dots in UTF-8 mode."
             else:
-                match = re.match(RE.trig_syntax, line)
-                if match:
+                search = re.search(RE.trig_syntax, line)
+                if search:
                     return "Triggers may only contain lowercase letters, numbers, and these symbols: ( | ) [ ] * _ # @ { } < > ="
         elif cmd == '-' or cmd == '^' or cmd == '/':
             # - Trigger, ^ Continue, / Comment
diff --git a/tests/test_format_message.py b/tests/test_format_message.py
@@ -28,4 +28,26 @@ def test_format_triggers(self):
 
         """)
         self.reply("hi there", "hi there")
-        self.reply("hi  here", "hi here")
+        self.reply("hi  here", "hi here")
+
+    def test_invalid_character_raise_exception(self):
+        self.assertRaises(Exception, self.new, """
+                                + $hello
+                                - hi
+                            """)  # This test passes with `match`, which only check at the beginning
+        self.assertRaises(Exception, self.new, """
+                        + hello$
+                        - hi
+                    """)   # This test does not pass because the beginning is good, no $
+        self.assertRaises(Exception, self.new, """
+                            > topic Greetings
+                                + hello
+                                - hi
+                            <topics
+                            """)
+        self.assertRaises(Exception, self.new, """
+                                    > object hash %perl
+                                      my ($rs, $args) = @_;
+                                      my $method = shift @{$args};
+                                    <object
+                                    """)  # Test for character violation in object, no %
