Ignore some punctuation in term highlighting

Currently only - and ". Should be made more robust at some point if it
turns out to not be enough.

Closes #47.

bookmarker/views.py

@@ -260,7 +260,7 @@ def get_definition(request):
             num_occurrences = existing_term.occurrences.count()
         else:
             definition = lookup_term(language, term)
-            highlights = term.lower()
+            highlights = term.lower().replace('-', ' ')
 
     return JsonResponse({
         'term': term,

templates/add_term.html

@@ -96,7 +96,7 @@ <h3>
             {% with error=term_form.highlights.errors %}
             <div class="{% if error %}error{% endif %} four wide field">
                 <label>
-                    Highlights{% if error %} (REQUIRED){% endif %}
+                    Highlights{% if error %} ({{ error|join:"" }}){% endif %}
                 </label>
                 {{ term_form.highlights }}
             </div>

vocab/forms.py

@@ -19,6 +19,14 @@ def clean(self):
         term = cleaned_data.get('text')
         language = cleaned_data.get('language')
         definition = cleaned_data.get('definition')
+        highlights = cleaned_data.get('highlights')
+
+        # Make sure the highlights are specified and don't contain " or -.
+        if not highlights:
+            self.add_error('highlights', 'REQUIRED')
+        else:
+            if '-' in highlights or '"' in highlights:
+                self.add_error('highlights', 'INVALID CHARS: - OR "')
 
         if not definition:
             term_exists = Term.objects.filter(

vocab/management/commands/test_quote_highlighting.py

@@ -19,8 +19,9 @@ def test_equality(self):
             highlighted_quote = o.get_highlighted_quote()
             if '<span class="highlight">' not in highlighted_quote:
                 self.fail(
-                    u"Failed: looking for {highlights} in '{quote}'".format(
-                        quote=o.quote,
-                        highlights=o.term.highlights
+                    u"Failed: looking for {h} in '{q}' (pk: {pk})'".format(
+                        q=o.quote,
+                        h=o.term.highlights,
+                        pk=o.term.pk,
                     )
                 )

vocab/models.py

@@ -76,10 +76,12 @@ def __unicode__(self):
 
     def get_highlighted_quote(self):
         q = self.quote
-        q_lower = self.quote.lower()  # for more efficient (?) searching
+        # For more efficient searching.
+        q_search = self.quote.lower().replace('-', ' ').replace('"', '')
         highlights = self.term.highlights.splitlines()
         for h in highlights:
-            if h in q_lower:
+            if h in q_search:
+                h = h.replace(' ', '[-" ]*')
                 q = re.sub('(' + h + ')', r'<span class="highlight">\1</span>', q,
                            flags=re.I)