Fixed unicode tags validation. Moved constants from classes to modules. Added error 404 when trying to get the non-existent thread. This fixes #19

boards/forms.py

@@ -1,63 +1,63 b''
 import re
 from django import forms
 from neboard import settings
 
 
 class PostForm(forms.Form):
     MAX_TEXT_LENGTH = 10000
     MAX_IMAGE_SIZE = 8 * 1024 * 1024
 
     title = forms.CharField(max_length=50, required=False)
     text = forms.CharField(widget=forms.Textarea, required=False)
     image = forms.ImageField(required=False)
 
     def clean_text(self):
         text = self.cleaned_data['text']
         if text:
             if len(text) > self.MAX_TEXT_LENGTH:
                 raise forms.ValidationError('Too many text')
         return text
 
     def clean_image(self):
         image = self.cleaned_data['image']
         if image:
             if image._size > self.MAX_IMAGE_SIZE:
                 raise forms.ValidationError('Too large image: more than ' +
                                             str(self.MAX_IMAGE_SIZE) + ' bytes')
         return image
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         text = cleaned_data.get('text')
         image = cleaned_data.get('image')
 
         if (not text) and (not image):
             raise forms.ValidationError('Enter either text or image')
 
         return cleaned_data
 
 
 class ThreadForm(PostForm):
-    regex_tags = re.compile(r'^[\w\s]+$')
+    regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
 
     tags = forms.CharField(max_length=100)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags']
 
         if tags:
             if not self.regex_tags.match(tags):
                 raise forms.ValidationError(
                     'Inappropriate characters in tags')
 
         return tags
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
 
 class SettingsForm(forms.Form):
     theme = forms.ChoiceField(choices=settings.THEMES, widget=forms.RadioSelect)
  No newline at end of file

boards/models.py

@@ -1,279 +1,278 b''
 import os
 from random import random
 import re
-from django.db import models
-from django.utils import timezone
 import time
 import math
-import markdown
-from markdown.inlinepatterns import Pattern
-from markdown.util import etree
+
+from django.db import models
+from django.http import Http404
+from django.utils import timezone
+from markupfield.fields import MarkupField
 
 from neboard import settings
-from markupfield.fields import MarkupField
+import thumbs
 
-import thumbs
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
+ALL_PAGES = -1
+OPENING_POST_WEIGHT = 5
+IMAGES_DIRECTORY = 'images/'
+FILE_EXTENSION_DELIMITER = '.'
+
+REGEX_PRETTY = re.compile(r'^\d(0)+$')
+REGEX_SAME = re.compile(r'^(.)\1+$')
 
 
 class PostManager(models.Manager):
-    ALL_PAGES = -1
-
     def create_post(self, title, text, image=None, parent_id=NO_PARENT,
                     ip=NO_IP, tags=None):
         post = self.create(title=title,
                            text=text,
                            pub_time=timezone.now(),
                            parent=parent_id,
                            image=image,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,
                            last_edit_time=timezone.now())
 
         if tags:
             for tag in tags:
                 post.tags.add(tag)
 
         if parent_id != NO_PARENT:
             self._bump_thread(parent_id)
         else:
             self._delete_old_threads()
 
         return post
 
     def delete_post(self, post):
         children = self.filter(parent=post.id)
         for child in children:
             self.delete_post(child)
         post.delete()
 
     def delete_posts_by_ip(self, ip):
         posts = self.filter(poster_ip=ip)
         for post in posts:
             self.delete_post(post)
 
     def get_threads(self, tag=None, page=ALL_PAGES):
         if tag:
             threads = self.filter(parent=NO_PARENT, tags=tag)
         else:
             threads = self.filter(parent=NO_PARENT)
         threads = threads.order_by('-last_edit_time')
 
-        if page != self.ALL_PAGES:
+        if page != ALL_PAGES:
             thread_count = len(threads)
 
             if page < self.get_thread_page_count(tag=tag):
                 start_thread = page * settings.THREADS_PER_PAGE
                 end_thread = min(start_thread + settings.THREADS_PER_PAGE,
                                  thread_count)
                 threads = threads[start_thread:end_thread]
 
         return threads
 
     def get_thread(self, opening_post_id):
         opening_post = self.get(id=opening_post_id)
 
+        if not opening_post:
+            raise Http404
+
         if opening_post.parent == NO_PARENT:
             replies = self.filter(parent=opening_post_id)
 
             thread = [opening_post]
             thread.extend(replies)
 
             return thread
 
     def exists(self, post_id):
         posts = self.filter(id=post_id)
 
         return posts.count() > 0
 
     def get_thread_page_count(self, tag=None):
         if tag:
             threads = self.filter(parent=NO_PARENT, tags=tag)
         else:
             threads = self.filter(parent=NO_PARENT)
 
         return int(math.ceil(threads.count() / float(
             settings.THREADS_PER_PAGE)))
 
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
         delete the old ones.
         """
 
         # TODO Move old threads to the archive instead of deleting them.
         # Maybe make some 'old' field in the model to indicate the thread
         # must not be shown and be able for replying.
 
         threads = self.get_threads()
         thread_count = len(threads)
 
         if thread_count > settings.MAX_THREAD_COUNT:
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[thread_count - num_threads_to_delete:]
 
             for thread in old_threads:
                 self.delete_post(thread)
 
     def _bump_thread(self, thread_id):
         thread = self.get(id=thread_id)
 
         if thread.can_bump():
             thread.last_edit_time = timezone.now()
             thread.save()
 
 
 class TagManager(models.Manager):
     def get_not_empty_tags(self):
         all_tags = self.all().order_by('name')
         tags = []
         for tag in all_tags:
             if not tag.is_empty():
                 tags.append(tag)
 
         return tags
 
     def get_popular_tags(self):
         all_tags = self.get_not_empty_tags()
 
         sorted_tags = sorted(all_tags, key=lambda tag: tag.get_popularity(),
                              reverse=True)
 
         return sorted_tags[:settings.POPULAR_TAGS]
 
 
 class Tag(models.Model):
     """
     A tag is a text node assigned to the post. The tag serves as a board
     section. There can be multiple tags for each message
     """
 
-    OPENING_POST_WEIGHT = 5
-
     objects = TagManager()
 
     name = models.CharField(max_length=100)
     # TODO Connect the tag to its posts to check the number of threads for
     # the tag.
 
     def __unicode__(self):
         return self.name
 
     def is_empty(self):
         return self.get_post_count() == 0
 
     def get_post_count(self):
         posts_with_tag = Post.objects.get_threads(tag=self)
         return posts_with_tag.count()
 
     def get_popularity(self):
         posts_with_tag = Post.objects.get_threads(tag=self)
         reply_count = 0
         for post in posts_with_tag:
             reply_count += post.get_reply_count()
             reply_count += self.OPENING_POST_WEIGHT
 
         return reply_count
 
 
 class Post(models.Model):
     """A post is a message."""
 
-    IMAGES_DIRECTORY = 'images/'
-    FILE_EXTENSION_DELIMITER = '.'
-
     objects = PostManager()
 
     def _update_image_filename(self, filename):
         """Get unique image filename"""
 
-        path = self.IMAGES_DIRECTORY
+        path = IMAGES_DIRECTORY
         new_name = str(int(time.mktime(time.gmtime())))
         new_name += str(int(random() * 1000))
-        new_name += self.FILE_EXTENSION_DELIMITER
-        new_name += filename.split(self.FILE_EXTENSION_DELIMITER)[-1:][0]
+        new_name += FILE_EXTENSION_DELIMITER
+        new_name += filename.split(FILE_EXTENSION_DELIMITER)[-1:][0]
 
         return os.path.join(path, new_name)
 
     title = models.CharField(max_length=50)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type='markdown', escape_html=True)
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=((200, 150),))
     poster_ip = models.IPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
     last_edit_time = models.DateTimeField()
 
-    regex_pretty = re.compile(r'^\d(0)+$')
-    regex_same = re.compile(r'^(.)\1+$')
-
     def __unicode__(self):
         return self.title + ' (' + self.text.raw + ')'
 
     def _get_replies(self):
         return Post.objects.filter(parent=self.id)
 
     def get_reply_count(self):
         return self._get_replies().count()
 
     def get_images_count(self):
         images_count = 1 if self.image else 0
         for reply in self._get_replies():
             if reply.image:
                 images_count += 1
 
         return images_count
 
     def get_gets_count(self):
         gets_count = 1 if self.is_get() else 0
         for reply in self._get_replies():
             if reply.is_get():
                 gets_count += 1
 
         return gets_count
 
     def is_get(self):
         """If the post has pretty id (1, 1000, 77777), than it is called GET"""
 
         first = self.id == 1
 
         id_str = str(self.id)
-        pretty = self.regex_pretty.match(id_str)
-        same_digits = self.regex_same.match(id_str)
+        pretty = REGEX_PRETTY.match(id_str)
+        same_digits = REGEX_SAME.match(id_str)
 
         return first or pretty or same_digits
 
     def can_bump(self):
         """Check if the thread can be bumped by replying"""
 
         replies_count = len(Post.objects.get_thread(self.id))
 
         return replies_count <= settings.MAX_POSTS_PER_THREAD
 
     def get_last_replies(self):
         if settings.LAST_REPLIES_COUNT > 0:
             reply_count = self.get_reply_count()
 
             if reply_count > 0:
                 reply_count_to_show = min(settings.LAST_REPLIES_COUNT,
                                           reply_count)
                 last_replies = self._get_replies()[reply_count
                                                    - reply_count_to_show:]
 
                 return last_replies
 
 
 class Admin(models.Model):
     """
     Model for admin users
     """
     name = models.CharField(max_length=100)
     password = models.CharField(max_length=100)
 
     def __unicode__(self):
         return self.name + '/' + '*' * len(self.password)
  No newline at end of file

boards/tests.py

@@ -1,133 +1,162 b''
+# coding=utf-8
 from django.utils.unittest import TestCase
 from django.test.client import Client
 
 import boards
 
 from boards.models import Post, Admin, Tag
 from neboard import settings
 
+TEST_TEXT = 'test text'
+
+NEW_THREAD_PAGE = '/'
+HTTP_CODE_REDIRECT = 302
+
 
 class BoardTests(TestCase):
     def _create_post(self):
         return Post.objects.create_post(title='title',
                                         text='text')
 
     def test_post_add(self):
         post = self._create_post()
 
         self.assertIsNotNone(post)
         self.assertEqual(boards.models.NO_PARENT, post.parent)
 
     def test_delete_post(self):
         post = self._create_post()
         post_id = post.id
 
         Post.objects.delete_post(post)
 
         self.assertFalse(Post.objects.exists(post_id))
 
     def test_delete_posts_by_ip(self):
         post = self._create_post()
         post_id = post.id
 
         Post.objects.delete_posts_by_ip('0.0.0.0')
 
         self.assertFalse(Post.objects.exists(post_id))
 
     # Authentication tests
 
     def _create_test_user(self):
         admin = Admin(name='test_username12313584353165',
                       password='test_userpassword135135512')
 
         admin.save()
         return admin
 
     def test_admin_login(self):
         client = Client()
 
         self.assertFalse('admin' in client.session)
 
         admin = self._create_test_user()
 
         response = client.post('/login',
                                {'name': admin.name, 'password': admin.password})
 
         # it means that login passed and user are redirected to another page
         self.assertEqual(302, response.status_code)
 
         self.assertTrue('admin' in client.session)
         self.assertTrue(client.session['admin'])
 
         admin.delete()
 
         wrong_name = 'sd2f1s3d21fs3d21f'
         wrong_password = 'sd2f1s3d21fs3d21fsdfsd'
 
         client.post('/login', {'name': wrong_name, 'password': wrong_password})
         self.assertFalse(client.session['admin'])
 
     def test_admin_logout(self):
         client = Client()
 
         self.assertFalse('admin' in client.session)
 
         admin = self._create_test_user()
 
         client.post('/login',
                     {'name': admin.name, 'password': admin.password})
 
         self.assertTrue(client.session['admin'])
 
         client.get('/logout')
 
         self.assertFalse(client.session['admin'])
 
         admin.delete()
 
     def test_get_thread(self):
         opening_post = self._create_post()
         op_id = opening_post.id
 
         for i in range(0, 2):
             Post.objects.create_post('title', 'text',
                                      parent_id=op_id)
 
         thread = Post.objects.get_thread(op_id)
 
         self.assertEqual(3, len(thread))
 
     def test_create_post_with_tag(self):
         tag = Tag.objects.create(name='test_tag')
         post = Post.objects.create_post(title='title', text='text', tags=[tag])
         self.assertIsNotNone(post)
 
     def test_thread_max_count(self):
         for i in range(settings.MAX_THREAD_COUNT + 1):
             self._create_post()
 
         self.assertEqual(settings.MAX_THREAD_COUNT,
                          len(Post.objects.get_threads()))
 
     def test_get(self):
         """Test if the get computes properly"""
 
         post = self._create_post()
 
         self.assertTrue(post.is_get())
 
     def test_pages(self):
         """Test that the thread list is properly split into pages"""
 
-        PAGE_NUMBER = 2
-
         for i in range(settings.MAX_THREAD_COUNT):
             self._create_post()
 
         all_threads = Post.objects.get_threads()
 
         posts_in_second_page = Post.objects.get_threads(page=1)
         first_post = posts_in_second_page[0]
 
         self.assertEqual(all_threads[settings.THREADS_PER_PAGE].id,
-                                     first_post.id)
  No newline at end of file
+                         first_post.id)
+
+    def test_post_validation(self):
+        """Test the validation of the post form"""
+
+        Post.objects.all().delete()
+
+        client = Client()
+
+        valid_tags = u'tag1 tag_2 тег_3'
+        invalid_tags = u'$%_356 ---'
+
+        response = client.post(NEW_THREAD_PAGE, {'title': 'test title',
+                                                 'text': TEST_TEXT,
+                                                 'tags': valid_tags})
+        self.assertEqual(response.status_code, HTTP_CODE_REDIRECT,
+                         msg='Posting new message failed: got code ' +
+                             str(response.status_code))
+
+        self.assertEqual(1, Post.objects.count(),
+                         msg='No posts were created')
+
+        response = client.post(NEW_THREAD_PAGE, {'text': TEST_TEXT,
+                                                 'tags': invalid_tags})
+        self.assertEqual(1, Post.objects.count(), msg='The validation passed '
+                                                      'where it should fail')
  No newline at end of file

boards/views.py

@@ -1,193 +1,192 b''
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
 from boards import forms
 import boards
 from boards.forms import ThreadForm, PostForm, SettingsForm
 from boards.models import Post, Admin, Tag
 from django.shortcuts import render, get_list_or_404, redirect
 from django.http import HttpResponseRedirect, Http404
 import neboard
 
 
 def index(request, page=0):
     context = RequestContext(request)
 
     if request.method == 'POST':
         return new_post(request)
     else:
         threads = Post.objects.get_threads(page=int(page))
 
         # TODO Get rid of the duplicate code in index and tag views
         context['threads'] = None if len(threads) == 0 else threads
         context['form'] = forms.ThreadForm()
         context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
         context['pages'] = range(Post.objects.get_thread_page_count())
 
         return render(request, 'posting_general.html',
                       context)
 
 
 def new_post(request, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
     if thread_id == boards.models.NO_PARENT:
         form = ThreadForm(request.POST, request.FILES)
     else:
         form = PostForm(request.POST, request.FILES)
 
     if form.is_valid():
         data = form.cleaned_data
     else:
         return redirect(index)
 
     title = data['title']
     text = data['text']
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     ip = _get_client_ip(request)
 
     tags = []
 
     new_thread = thread_id == boards.models.NO_PARENT
     if new_thread:
         tag_strings = data['tags']
 
         if tag_strings:
             tag_strings = tag_strings.split(' ')
             for tag_name in tag_strings:
                 tag_name = tag_name.strip()
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
     # TODO Add a possibility to define a link image instead of an image file.
     # If a link is given, download the image automatically.
 
     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                     parent_id=thread_id, image=image,
                                     tags=tags)
 
     thread_to_show = (post.id if new_thread else thread_id)
 
     if new_thread:
         return redirect(thread, post_id=thread_to_show)
     else:
         return redirect(reverse(thread,
                                 kwargs={'post_id': thread_to_show}) + '#'
                         + str(post.id))
 
 
 def tag(request, tag_name, page=0):
     """Get all tag threads (posts without a parent)."""
 
     tag = Tag.objects.get(name=tag_name)
     threads = Post.objects.get_threads(tag=tag, page=int(page))
 
     if request.method == 'POST':
         return new_post(request)
     else:
         context = RequestContext(request)
         context['threads'] = None if len(threads) == 0 else threads
         context['tag'] = tag_name
         context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
         context['pages'] = range(Post.objects.get_thread_page_count(tag=tag))
 
         context['form'] = forms.ThreadForm(initial={'tags': tag_name})
 
         return render(request, 'posting_general.html',
                       context)
 
 
 def thread(request, post_id):
     """Get all thread posts"""
 
     if request.method == 'POST':
         return new_post(request, post_id)
     else:
-        # TODO Show 404 if there is no such thread
         posts = Post.objects.get_thread(post_id)
 
         context = RequestContext(request)
 
         context['posts'] = posts
         context['form'] = forms.PostForm()
         context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
 
         return render(request, 'thread.html', context)
 
 
 def login(request):
     """Log in as admin"""
 
     if 'name' in request.POST and 'password' in request.POST:
         request.session['admin'] = False
 
         isAdmin = len(Admin.objects.filter(name=request.POST['name'],
                                            password=request.POST[
                                                'password'])) > 0
 
         if isAdmin:
             request.session['admin'] = True
 
             response = HttpResponseRedirect('/')
 
         else:
             response = render(request, 'login.html', {'error': 'Login error'})
     else:
         response = render(request, 'login.html', {})
 
     return response
 
 
 def logout(request):
     request.session['admin'] = False
     return HttpResponseRedirect('/')
 
 
 def settings(request):
     context = RequestContext(request)
 
     if request.method == 'POST':
         form = SettingsForm(request.POST)
         if form.is_valid():
             selected_theme = form.cleaned_data['theme']
             request.session['theme'] = selected_theme
 
         return redirect(settings)
     else:
         selected_theme = _get_theme(request)
         form = SettingsForm(initial={'theme': selected_theme})
         context['form'] = form
         context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
 
         return render(request, 'settings.html', context)
 
 
 def all_tags(request):
     context = RequestContext(request)
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
     return render(request, 'tags.html', context)
 
 
 def _get_theme(request):
     return request.session.get('theme', neboard.settings.DEFAULT_THEME)
 
 
 def _get_client_ip(request):
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
     if x_forwarded_for:
         ip = x_forwarded_for.split(',')[-1].strip()
     else:
         ip = request.META.get('REMOTE_ADDR')
     return ip
  No newline at end of file