Defined encoding in the HTML. Fixed error 404 page on opening reply as thread. This fixes #46, #47

boards/models.py

@@ -1,288 +1,288 b''
 import os
 from random import random
 import re
 import time
 import math
 
 from django.db import models
 from django.http import Http404
 from django.utils import timezone
 from markupfield.fields import MarkupField
 
 from neboard import settings
 import thumbs
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 50
 
 DEFAULT_MARKUP_TYPE = 'markdown'
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 ALL_PAGES = -1
 OPENING_POST_POPULARITY_WEIGHT = 2
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
 
 REGEX_PRETTY = re.compile(r'^\d(0)+$')
 REGEX_SAME = re.compile(r'^(.)\1+$')
 
 
 class PostManager(models.Manager):
     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:
             map(post.tags.add, tags)
 
         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)
 
         if not threads:
             raise Http404
 
         threads = threads.order_by('-last_edit_time')
 
         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):
         try:
-            opening_post = self.get(id=opening_post_id)
+            opening_post = self.get(id=opening_post_id, parent=NO_PARENT)
         except Post.DoesNotExist:
             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
     """
 
     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 += OPENING_POST_POPULARITY_WEIGHT
 
         return reply_count
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     def _update_image_filename(self, filename):
         """Get unique image filename"""
 
         path = IMAGES_DIRECTORY
         new_name = str(int(time.mktime(time.gmtime())))
         new_name += str(int(random() * 1000))
         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=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE,
                        escape_html=True)
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=(IMAGE_THUMB_SIZE,))
     poster_ip = models.IPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
     last_edit_time = models.DateTimeField()
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + 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 = 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)

boards/templates/boards/base.html

@@ -1,44 +1,45 b''
 {% load staticfiles %}
 {% load i18n %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css"
           href="{{ STATIC_URL }}css/jquery.fancybox.css" media="all"/>
     <link rel="stylesheet" type="text/css"
           href="{{ STATIC_URL }}css/{{ theme }}/base_page.css" media="all"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta charset="utf-8"/>
     {% block head %}{% endblock %}
 </head>
 <body>
 <script src="{{ STATIC_URL }}js/jquery-2.0.1.min.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.fancybox.pack.js"></script>
 <script src="{{ STATIC_URL }}js/main.js"></script>
 <div id="admin_panel">
 
     {% if request.session.admin == True %}
         Admin panel TODO: Need to implement <BR />
     {% endif %}
 
 </div>
 
 <div class="navigation_panel">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
         <a class="tag" href=" {% url 'tag' tag_name=tag.name %}">
             {{ tag.name }}</a>({{ tag.get_post_count }})
     {% endfor %}
     <a class="tag" href="{% url 'tags' %}">[...]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     <a class="link" href="#top">{% trans 'Up' %}</a>
 </div>
 
 </body>
 </html>
  No newline at end of file

boards/tests.py

@@ -1,210 +1,218 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 = '/'
 THREAD_PAGE_ONE = '/thread/1/'
 THREAD_PAGE = '/thread/'
 TAG_PAGE = '/tag/'
 HTTP_CODE_REDIRECT = 302
 HTTP_CODE_OK = 200
 HTTP_CODE_NOT_FOUND = 404
 
 
 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"""
 
         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)
 
     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')
 
         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')
 
         response = client.post(THREAD_PAGE_ONE, {'text': TEST_TEXT,
                                              'tags': valid_tags})
         self.assertEqual(HTTP_CODE_REDIRECT, response.status_code,
                          msg=u'Posting new message failed: got code ' +
                              str(response.status_code))
 
         self.assertEqual(2, Post.objects.count(),
                          msg=u'No posts were created')
 
     def test_404(self):
         """Test receiving error 404 when opening a non-existent page"""
 
         Post.objects.all().delete()
         Tag.objects.all().delete()
 
         tag_name = u'test_tag'
         tags, = [Tag.objects.get_or_create(name=tag_name)]
         client = Client()
 
         Post.objects.create_post('title', TEST_TEXT, tags=tags)
 
         existing_post_id = Post.objects.all()[0].id
         response_existing = client.get(THREAD_PAGE + str(existing_post_id) +
                                        '/')
         self.assertEqual(HTTP_CODE_OK, response_existing.status_code,
                          u'Cannot open existing thread')
 
         response_not_existing = client.get(THREAD_PAGE + str(
             existing_post_id + 1) + '/')
         self.assertEqual(HTTP_CODE_NOT_FOUND,
                          response_not_existing.status_code,
                          u'Not existing thread is opened')
 
         response_existing = client.get(TAG_PAGE + tag_name + '/')
         self.assertEqual(HTTP_CODE_OK,
                          response_existing.status_code,
                          u'Cannot open existing tag')
 
         response_not_existing = client.get(TAG_PAGE + u'not_tag' + '/')
         self.assertEqual(HTTP_CODE_NOT_FOUND,
                          response_not_existing.status_code,
-                         u'Not existing tag is opened')
  No newline at end of file
+                         u'Not existing tag is opened')
+
+        reply_id = Post.objects.create_post('', TEST_TEXT,
+                                            parent_id=existing_post_id)
+        response_not_existing = client.get(THREAD_PAGE + str(
+            reply_id) + '/')
+        self.assertEqual(HTTP_CODE_NOT_FOUND,
+                         response_not_existing.status_code,
+                         u'Not existing thread is opened')