Merge remote-tracking branch 'upstream/master'

23 files changed, 164 insertions, 17 deletions

diff --git a/askbot/locale/de/LC_MESSAGES/django.mo b/askbot/locale/de/LC_MESSAGES/django.mo
index 668a17c4..e54c459f 100644
--- a/askbot/locale/de/LC_MESSAGES/django.mo
+++ b/askbot/locale/de/LC_MESSAGES/django.mo
diff --git a/askbot/locale/de/LC_MESSAGES/django.po b/askbot/locale/de/LC_MESSAGES/django.po
index c072aa70..abeee17f 100644
--- a/askbot/locale/de/LC_MESSAGES/django.po
+++ b/askbot/locale/de/LC_MESSAGES/django.po
@@ -2344,7 +2344,7 @@ msgstr "registrieren/"
 
 #: deps/django_authopenid/urls.py:21
 msgid "signup/"
-msgstr "registrieren/"
+msgstr ""
 
 #: deps/django_authopenid/urls.py:25
 msgid "logout/"
diff --git a/askbot/locale/en/LC_MESSAGES/django.mo b/askbot/locale/en/LC_MESSAGES/django.mo
index 1f065123..e1f4a2e9 100644
--- a/askbot/locale/en/LC_MESSAGES/django.mo
+++ b/askbot/locale/en/LC_MESSAGES/django.mo
diff --git a/askbot/locale/fi/LC_MESSAGES/django.mo b/askbot/locale/fi/LC_MESSAGES/django.mo
index cbd57018..e4142187 100644
--- a/askbot/locale/fi/LC_MESSAGES/django.mo
+++ b/askbot/locale/fi/LC_MESSAGES/django.mo
diff --git a/askbot/locale/fr/LC_MESSAGES/django.mo b/askbot/locale/fr/LC_MESSAGES/django.mo
index 1fe00ef0..709cd9e9 100644
--- a/askbot/locale/fr/LC_MESSAGES/django.mo
+++ b/askbot/locale/fr/LC_MESSAGES/django.mo
diff --git a/askbot/locale/it/LC_MESSAGES/django.mo b/askbot/locale/it/LC_MESSAGES/django.mo
index 6cbc8fac..46ec86a8 100644
--- a/askbot/locale/it/LC_MESSAGES/django.mo
+++ b/askbot/locale/it/LC_MESSAGES/django.mo
diff --git a/askbot/locale/ja/LC_MESSAGES/django.mo b/askbot/locale/ja/LC_MESSAGES/django.mo
index efb75cc8..7f98e565 100644
--- a/askbot/locale/ja/LC_MESSAGES/django.mo
+++ b/askbot/locale/ja/LC_MESSAGES/django.mo
diff --git a/askbot/locale/ko/LC_MESSAGES/django.mo b/askbot/locale/ko/LC_MESSAGES/django.mo
index 5f175980..c117d238 100644
--- a/askbot/locale/ko/LC_MESSAGES/django.mo
+++ b/askbot/locale/ko/LC_MESSAGES/django.mo
diff --git a/askbot/locale/pt_BR/LC_MESSAGES/django.mo b/askbot/locale/pt_BR/LC_MESSAGES/django.mo
index 172807a7..2e17a8ef 100644
--- a/askbot/locale/pt_BR/LC_MESSAGES/django.mo
+++ b/askbot/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/askbot/locale/ro/LC_MESSAGES/django.mo b/askbot/locale/ro/LC_MESSAGES/django.mo
index 7b66727a..33ff42f7 100644
--- a/askbot/locale/ro/LC_MESSAGES/django.mo
+++ b/askbot/locale/ro/LC_MESSAGES/django.mo
diff --git a/askbot/locale/ru/LC_MESSAGES/django.mo b/askbot/locale/ru/LC_MESSAGES/django.mo
index c41a06bf..4d01e193 100644
--- a/askbot/locale/ru/LC_MESSAGES/django.mo
+++ b/askbot/locale/ru/LC_MESSAGES/django.mo
diff --git a/askbot/locale/sr/LC_MESSAGES/django.mo b/askbot/locale/sr/LC_MESSAGES/django.mo
index 00cab4f5..3e3ca237 100644
--- a/askbot/locale/sr/LC_MESSAGES/django.mo
+++ b/askbot/locale/sr/LC_MESSAGES/django.mo
diff --git a/askbot/locale/tr/LC_MESSAGES/django.mo b/askbot/locale/tr/LC_MESSAGES/django.mo
index 5e511994..5f3f7a79 100644
--- a/askbot/locale/tr/LC_MESSAGES/django.mo
+++ b/askbot/locale/tr/LC_MESSAGES/django.mo
diff --git a/askbot/locale/vi/LC_MESSAGES/django.mo b/askbot/locale/vi/LC_MESSAGES/django.mo
index 4f175ad6..cb82d178 100644
--- a/askbot/locale/vi/LC_MESSAGES/django.mo
+++ b/askbot/locale/vi/LC_MESSAGES/django.mo
diff --git a/askbot/locale/zh-tw/LC_MESSAGES/django.mo b/askbot/locale/zh-tw/LC_MESSAGES/django.mo
index 9e398bb2..3a914dd3 100644
--- a/askbot/locale/zh-tw/LC_MESSAGES/django.mo
+++ b/askbot/locale/zh-tw/LC_MESSAGES/django.mo
diff --git a/askbot/locale/zh_CN/LC_MESSAGES/django.mo b/askbot/locale/zh_CN/LC_MESSAGES/django.mo
index 59fb0403..e0c7877e 100644
--- a/askbot/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/askbot/locale/zh_CN/LC_MESSAGES/django.mo
diff --git a/askbot/migrations/0050_move_qa_revisions_to_postrevision.py b/askbot/migrations/0050_move_qa_revisions_to_postrevision.py
index 3067a87c..36c46551 100644
--- a/askbot/migrations/0050_move_qa_revisions_to_postrevision.py
+++ b/askbot/migrations/0050_move_qa_revisions_to_postrevision.py
@@ -1,8 +1,10 @@
 # encoding: utf-8
 import datetime
+
+from django.db import models
+
 from south.db import db
 from south.v2 import DataMigration
-from django.db import models
 
 class Migration(DataMigration):
 
@@ -33,17 +35,19 @@ class Migration(DataMigration):
             is_anonymous=source_revision.is_anonymous
         )
 
+        # INFO: There's no need to migrate also the related Activity instances
+        # - it's because `revision edited` Activities point to Question&Answer instances
+        # ans not to their relevant revisions. (BTW this might be considered a bug)
+
+
     def forwards(self, orm):
+        # Process revisions
         for qr in orm.QuestionRevision.objects.all():
             self.copy_revision(orm=orm, source_revision=qr)
 
         for ar in orm.AnswerRevision.objects.all():
             self.copy_revision(orm=orm, source_revision=ar)
 
-        # TODO:
-        #      In the next migration (0050) QuestionRevision and AnswerRevision tables are dropped.
-        #      So if there is anything else to migrate here, we have to figure that out before merging this to trunk.
-
 
     def backwards(self, orm):
         "Write your backwards methods here."
diff --git a/askbot/models/post.py b/askbot/models/post.py
index c61e8877..16352228 100644
--- a/askbot/models/post.py
+++ b/askbot/models/post.py
@@ -1,4 +1,5 @@
 from django.db import models
+from django.core.exceptions import ValidationError
 
 from askbot.utils import markup
 from askbot.utils.html import sanitize_html
@@ -7,13 +8,20 @@ from askbot.utils.html import sanitize_html
 #    pass
 
 class PostRevisionManager(models.Manager):
+    # TODO: Make sure this manager /with the "blocked" .create() method/ is used also as a `related` manager:
+    # - https://docs.djangoproject.com/en/1.3/topics/db/managers/#controlling-automatic-manager-types
+    # - use_for_related_fields
+    def create(self, *kargs, **kwargs):
+        raise NotImplementedError  # Prevent accidental creation of PostRevision instance without `revision_type` set
+
+
     def create_question_revision(self, *kargs, **kwargs):
         kwargs['revision_type'] = self.model.QUESTION_REVISION
-        return self.create(*kargs, **kwargs)
+        return super(PostRevisionManager, self).create(*kargs, **kwargs)
 
     def create_answer_revision(self, *kargs, **kwargs):
         kwargs['revision_type'] = self.model.ANSWER_REVISION
-        return self.create(*kargs, **kwargs)
+        return super(PostRevisionManager, self).create(*kargs, **kwargs)
 
     def question_revisions(self):
         return self.filter(revision_type=self.model.QUESTION_REVISION)
@@ -74,15 +82,21 @@ class PostRevision(models.Model):
         elif self.is_answer_revision():
             return self.answer
 
-    def save(self, **kwargs):
-        """Determines the revistion type and then looks up the next available revision number if not set."""
+    def clean(self):
+        "Internal cleaning method, called from self.save() by self.full_clean()"
+        if bool(self.question) == bool(self.answer): # one and only one has to be set (!xor)
+            raise ValidationError('One (and only one) of question/answer fields has to be set.')
+        if (self.question and not self.is_question_revision()) or (self.answer and not self.is_answer_revision()):
+            raise ValidationError('Revision_type doesn`t match values in question/answer fields.')
 
+    def save(self, **kwargs):
+        # Determine the revision number, if not set
         if not self.revision:
-            # TODO: Maybe use Max() aggregation?
-            # TODO: Handle IntegrityError if revision id is already occupied?
+            # TODO: Maybe use Max() aggregation? Or `revisions.count() + 1`
             self.revision = self.parent().revisions.values_list('revision', flat=True)[0] + 1
 
-        self.full_clean() # Make sure that everything is ok, in particular that `revision_type` and `revision` are set to valid values
+        # Make sure that everything is ok, in particular that `revision_type` and `revision` are set to valid values
+        self.full_clean()
 
         super(PostRevision, self).save(**kwargs)
 
diff --git a/askbot/skins/common/media/js/wmd/wmd.js b/askbot/skins/common/media/js/wmd/wmd.js
index bc3b5a0c..f5354fac 100644
--- a/askbot/skins/common/media/js/wmd/wmd.js
+++ b/askbot/skins/common/media/js/wmd/wmd.js
@@ -244,7 +244,7 @@ util.prompt = function(text, defaultInputText, makeLinkMarkdown, dialogType){
             text = text.replace('http://https://', 'https://');
             text = text.replace('http://ftp://', 'ftp://');
             
-            if (text.indexOf('http://') === -1 && text.indexOf('ftp://') === -1) {
+            if (text.indexOf('http://') === -1 && text.indexOf('ftp://') === -1 && text.indexOf('https://') === -1) {
                 if (dialogType == 'link'){
                     //add http only to urls
                     text = 'http://' + text;
diff --git a/askbot/tests/__init__.py b/askbot/tests/__init__.py
index b06c2b06..a9fa761b 100644
--- a/askbot/tests/__init__.py
+++ b/askbot/tests/__init__.py
@@ -11,3 +11,5 @@ from askbot.tests.form_tests import *
 from askbot.tests.follow_tests import *
 from askbot.tests.templatefilter_tests import *
 from askbot.tests.markup_test import *
+from askbot.tests.misc_tests import *
+from askbot.tests.post_model_tests import *
diff --git a/askbot/tests/misc_tests.py b/askbot/tests/misc_tests.py
new file mode 100644
index 00000000..ddf16360
--- /dev/null
+++ b/askbot/tests/misc_tests.py
@@ -0,0 +1,50 @@
+import datetime
+from django.contrib.contenttypes.models import ContentType
+from django.test.client import Client
+from askbot.tests.utils import AskbotTestCase
+from askbot.conf import settings
+from askbot import models
+from askbot.models.badges import award_badges_signal
+
+from askbot.views.users import get_related_object_type_name
+
+class MiscTests(AskbotTestCase):
+
+    def setUp(self):
+        self.u1 = self.create_user(username='user1')
+        self.u2 = self.create_user(username='user2')
+        self.u3 = self.create_user(username='user3')
+
+    def test_get_related_object_type_name_for_question(self):
+        question = self.post_question(user=self.u1)
+        ct = ContentType.objects.get_for_model(question)
+        self.assertEqual('question', get_related_object_type_name(ct.id, question.id))
+
+    def test_get_related_object_type_name_for_question_revision(self):
+        question = self.post_question(user=self.u1)
+        revision = question.revisions.all()[0]
+        ct = ContentType.objects.get_for_model(revision)
+        self.assertEqual('question', get_related_object_type_name(ct.id, revision.id))
+
+    def test_get_related_object_type_name_for_answer(self):
+        question = self.post_question(user=self.u1)
+        answer = self.post_answer(user=self.u1, question=question)
+        ct = ContentType.objects.get_for_model(answer)
+        self.assertEqual('answer', get_related_object_type_name(ct.id, answer.id))
+
+    def test_get_related_object_type_name_for_answer_revision(self):
+        question = self.post_question(user=self.u1)
+        answer = self.post_answer(user=self.u1, question=question)
+        revision = answer.revisions.all()[0]
+        ct = ContentType.objects.get_for_model(revision)
+        self.assertEqual('answer', get_related_object_type_name(ct.id, revision.id))
+
+    def test_get_related_object_type_name_for_anything_else_1(self):
+        ct = ContentType.objects.get_for_model(self.u2)
+        self.assertIsNone(get_related_object_type_name(ct.id, self.u2.id))
+
+    def test_get_related_object_type_name_for_anything_else_2(self):
+        question = self.post_question(user=self.u1)
+        comment = self.post_comment(user=self.u1, parent_post=question)
+        ct = ContentType.objects.get_for_model(comment)
+        self.assertIsNone(get_related_object_type_name(ct.id, comment.id))
diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py
index 9c107112..442b1bd7 100644
--- a/askbot/tests/page_load_tests.py
+++ b/askbot/tests/page_load_tests.py
@@ -25,9 +25,10 @@ def patch_jinja2():
 
 (CMAJOR, CMINOR, CMICRO) = package_utils.get_coffin_version()
 if CMAJOR == 0 and CMINOR == 3 and CMICRO < 4:
+    import ipdb; ipdb.set_trace()
     patch_jinja2()
 
-class PageLoadTestCase(TestCase):
+class PageLoadTestCase(AskbotTestCase):
     def try_url(
             self,
             url_name, status_code=200, template=None, 
@@ -66,8 +67,29 @@ class PageLoadTestCase(TestCase):
             else:
                 raise Exception('unexpected error while runnig test')
 
-class PageLoadTests(PageLoadTestCase):
-    fixtures = ['tmp/fixture2.json', ]
+    def setUp(self):
+        self.u1 = self.create_user(username='user1')
+        self.u2 = self.create_user(username='user2')
+        self.u3 = self.create_user(username='user3')
+
+        self.question = self.post_question(user=self.u1)
+
+        self.answer = self.post_answer(user=self.u1, question=self.question)
+        self.answer.id = 38 # one of the tests tries this id
+        self.answer.save()
+
+        self.question2 = self.post_question(user=self.u2)
+        self.question2.id = 2
+        self.question2.save()
+
+        self.question3 = self.post_question(user=self.u3)
+        self.question3.id = 3
+        self.question3.save()
+
+        self.question17 = self.post_question(user=self.u1)
+        self.question17.id = 17
+        self.question17.save()
+
 
     def test_index(self):
         #todo: merge this with all reader url tests
diff --git a/askbot/tests/post_model_tests.py b/askbot/tests/post_model_tests.py
new file mode 100644
index 00000000..7ea8621a
--- /dev/null
+++ b/askbot/tests/post_model_tests.py
@@ -0,0 +1,55 @@
+import datetime
+
+from django.core.exceptions import ValidationError
+from askbot.tests.utils import AskbotTestCase
+from askbot.models import PostRevision
+
+
+class PostModelTests(AskbotTestCase):
+
+    def setUp(self):
+        self.u1 = self.create_user(username='user1')
+        self.u2 = self.create_user(username='user2')
+        self.u3 = self.create_user(username='user3')
+
+    def test_model_validation(self):
+        with self.assertRaises(NotImplementedError):
+            PostRevision.objects.create(text='blah', author=self.u1, revised_at=datetime.datetime.now(), revision_type=PostRevision.QUESTION_REVISION)
+
+        with self.assertRaisesRegexp(AttributeError, r"'NoneType' object has no attribute 'revisions'"):
+            # cannot set `revision` without a parent
+            PostRevision.objects.create_answer_revision(text='blah', author=self.u1, revised_at=datetime.datetime.now())
+
+        with self.assertRaisesRegexp(ValidationError, r"{'__all__': \[u'One \(and only one\) of question/answer fields has to be set.'\], 'revision_type': \[u'Value 4 is not a valid choice.'\]}"):
+            # revision_type not in (1,2)
+            PostRevision(text='blah', author=self.u1, revised_at=datetime.datetime.now(), revision=1, revision_type=4).save()
+
+        question = self.post_question(user=self.u1)
+
+        rev2 = PostRevision(question=question, text='blah', author=self.u1, revised_at=datetime.datetime.now(), revision=2, revision_type=PostRevision.QUESTION_REVISION)
+        rev2.save()
+        self.assertIsNotNone(rev2.id)
+
+        with self.assertRaisesRegexp(ValidationError, r"{'__all__': \[u'Revision_type doesn`t match values in question/answer fields.', u'Post revision with this Question and Revision already exists.'\]}"):
+            PostRevision(question=question, text='blah', author=self.u1, revised_at=datetime.datetime.now(), revision=2, revision_type=PostRevision.ANSWER_REVISION).save()
+
+        with self.assertRaisesRegexp(ValidationError, r"{'__all__': \[u'Revision_type doesn`t match values in question/answer fields.'\]}"):
+            PostRevision(question=question, text='blah', author=self.u1, revised_at=datetime.datetime.now(), revision=3, revision_type=PostRevision.ANSWER_REVISION).save()
+
+        rev3 = PostRevision.objects.create_question_revision(question=question, text='blah', author=self.u1, revised_at=datetime.datetime.now(), revision_type=123) # revision_type
+        self.assertIsNotNone(rev3.id)
+        self.assertEqual(3, rev3.revision) # By the way: let's test the auto-increase of revision number
+        self.assertEqual(PostRevision.QUESTION_REVISION, rev3.revision_type)
+
+    def test_post_revision_autoincrease(self):
+        question = self.post_question(user=self.u1)
+        self.assertEqual(1, question.revisions.all()[0].revision)
+        self.assertEqual(1, question.revisions.count())
+
+        question.apply_edit(edited_by=self.u1, text="blah2", comment="blahc2")
+        self.assertEqual(2, question.revisions.all()[0].revision)
+        self.assertEqual(2, question.revisions.count())
+
+        question.apply_edit(edited_by=self.u1, text="blah3", comment="blahc3")
+        self.assertEqual(3, question.revisions.all()[0].revision)
+        self.assertEqual(3, question.revisions.count())