Merge pull request #653 from willkg/1175123-fixes

[bug 1175123] Fix keyword matching
mozilla · Aug 26, 2015 · 3daef19 · 3daef19
2 parents 912dcde + 938e8d2
commit 3daef19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/fjord/suggest/providers/trigger/models.py b/fjord/suggest/providers/trigger/models.py
@@ -54,8 +54,10 @@ def _escape(utext):
         u'|'.join(keywords) +
         u')'
     )
-    regex = ur'((?:^|\s)' + middle + ur'(?:\s|$))'
-    return re.compile(regex, re.LOCALE | re.IGNORECASE | re.UNICODE)
+    # Note: Can't use \b here because we need to be able to find
+    # arbitrary strings--not just alphanumeric ones.
+    regex = ur'(?:^|\W)' + middle + ur'(?:\W|$)'
+    return re.compile(regex, re.IGNORECASE | re.UNICODE)
 
 
 class TriggerRule(ModelBase):

diff --git a/fjord/suggest/providers/trigger/tests/test_models.py b/fjord/suggest/providers/trigger/tests/test_models.py
@@ -84,6 +84,8 @@ def test_match_keywords(self):
             ([u'\xca'], u'abcd \xca abcd', True),
             ([u'my-cat'], u'my-cat has fleas', True),
             ([u'(my cat)'], u'(my cat) has fleas', True),
+            ([u'cat'], u'i love my cat!', True),
+            ([u'cat'], u'(cat)', True),
         ]
         for tr_keywords, description, expected in tests:
             tr = TriggerRuleFactory(keywords=tr_keywords)