- bug fixes

- added middleware tests

Author: saxix

concurrency/__init__.py

@@ -2,7 +2,7 @@
 import datetime
 import os
 
-VERSION = __version__ = (0, 4, 0, 'rc', 1)
+VERSION = __version__ = (0, 4, 0, 'rc', 2)
 __author__ = 'sax'
 
 

concurrency/core.py

@@ -53,12 +53,10 @@ def concurrency_check(model_instance, force_insert=False, force_update=False, us
 
 def _select_lock(model_instance, version_value=None):
     version_field = model_instance.RevisionMetaInfo.field
-    value = getattr(model_instance, version_field.name)
+    value = version_value or getattr(model_instance, version_field.name)
     is_versioned = value != version_field.get_default()
-
     if model_instance.pk is not None:
-        kwargs = {'pk': model_instance.pk,
-                  version_field.name: version_value or getattr(model_instance, version_field.name)}
+        kwargs = {'pk': model_instance.pk, version_field.name: value}
         alias = router.db_for_write(model_instance)
         NOWAIT = connections[alias].features.has_select_for_update_nowait
         entry = model_instance.__class__.objects.select_for_update(nowait=NOWAIT).filter(**kwargs)

concurrency/forms.py

@@ -48,6 +48,14 @@ class VersionFieldSigner(Signer):
     pass
 
 
+class SignedValue(object):
+    def __init__(self, value):
+        self.value = value
+
+    def __repr__(self):
+        return self.value
+
+
 class VersionField(forms.IntegerField):
     widget = HiddenInput # Default widget to use when rendering this type of Field.
     hidden_widget = HiddenInput# Default widget to use when rendering this as "hidden".
@@ -61,17 +69,20 @@ def __init__(self, *args, **kwargs):
         kwargs.setdefault('widget', HiddenInput)
         super(VersionField, self).__init__(*args, **kwargs)
 
+    def bound_data(self, data, initial):
+        return SignedValue(data)
+
     def prepare_value(self, value):
-        if value:
-            return self._signer.sign(value)
-        return None
+        if isinstance(value, SignedValue):
+            return value
+        return SignedValue(self._signer.sign(value))
 
     def to_python(self, value):
         try:
             if value not in (None, '', 'None'):
                 return int(self._signer.unsign(value))
             return 0
-        except (BadSignature, ValueError):
+        except (BadSignature, ValueError) as e:
             raise SuspiciousOperation(_('Version number seems tampered'))
 
     def widget_attrs(self, widget):

concurrency/middleware.py

@@ -4,6 +4,8 @@
 from concurrency.views import handler409
 
 
+
+# This middleware is still alpha and should not be used.
 class ConcurrencyMiddleware(object):
     def process_exception(self, request, exception):
         if isinstance(exception, RecordModifiedError):

concurrency/tests/contrib_admin.py

@@ -1,3 +1,4 @@
+import re
 from django.contrib import admin
 import os
 
@@ -35,11 +36,11 @@ class TestModel1Admin(admin.ModelAdmin):
                              widgets={'version': VersionWidget()})
 
 
-class TestDjangoAdmin(TestCase):
+class DjangoAdminTestCase(TestCase):
     urls = 'concurrency.tests.urls'
 
     def setUp(self):
-        super(TestDjangoAdmin, self).setUp()
+        super(DjangoAdminTestCase, self).setUp()
         self.sett = self.settings(INSTALLED_APPS=INSTALLED_APPS,
                                   MIDDLEWARE_CLASSES=global_settings.MIDDLEWARE_CLASSES,
                                   AUTHENTICATION_BACKENDS=global_settings.AUTHENTICATION_BACKENDS,
@@ -48,8 +49,7 @@ def setUp(self):
                                   SOUTH_TESTS_MIGRATE=False,
                                   TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), 'templates'),),
                                   #            TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader',)
-
-                                  )
+        )
         self.sett.enable()
         django.core.management._commands = None # reset commands cache
         django.core.management.call_command('syncdb', verbosity=0)
@@ -63,11 +63,13 @@ def setUp(self):
         self.target1, __ = TestModel1.objects.get_or_create(username='bbb')
 
     def tearDown(self):
-        super(TestDjangoAdmin, self).tearDown()
+        super(DjangoAdminTestCase, self).tearDown()
         self.sett.disable()
         admin.site.unregister(TestModel0)
         admin.site.unregister(TestModel1)
 
+class TestDjangoAdmin(DjangoAdminTestCase):
+
     def test_creation(self):
         url = reverse('admin:concurrency_testmodel0_add')
         data = {'username': u'new_username',
@@ -125,15 +127,19 @@ def test_conflict(self):
         url = reverse('admin:concurrency_testmodel1_change', args=[self.target1.pk])
         response = self.client.get(url)
         self.assertIn('original', response.context, response)
-
+        # form = response.context['adminform'].form
+        rex = re.compile('name="version" value="(\d*):(.[^"]*)"')
+        m = rex.search(str(response), re.M + re.I)
+        assert m.group(1) == str(response.context['original'].version)
         data = {'username': u'new_username',
                 'last_name': None,
-                'version': response.context['adminform'].form['version'].value(),
+                'version': VersionFieldSigner().sign(m.group(1)),
+                # 'version': response.context['adminform'].form['version'].value(),
                 'char_field': None,
                 '_continue': 1,
                 'date_field': '2010-09-01'}
 
-        self.target1.save() # conflict here
+        self.target1.save() # create conflict here
 
         response = self.client.post(url, data, follow=True)
         self.assertIn('original', response.context, response)
@@ -142,3 +148,25 @@ def test_conflict(self):
         self.assertIn('Record Modified',
                       str(response.context['adminform'].form.errors),
                       response.context['adminform'].form.errors)
+
+    def test_sanity_signer(self):
+        url = reverse('admin:concurrency_testmodel1_change', args=[self.target1.pk])
+        response = self.client.get(url)
+        self.assertIn('original', response.context, response)
+        rex = re.compile('name="version" value="(\d*):(.[^"]*)"')
+
+        m1 = rex.search(str(response), re.M + re.I)
+        assert m1.group(1) == str(response.context['original'].version)
+        data = {'username': u'new_username',
+                'last_name': None,
+                'version': VersionFieldSigner().sign(m1.group(1)),
+                'char_field': None,
+                '_continue': 1,
+                'date_field': 'esss2010-09-01'}
+
+        response = self.client.post(url, data, follow=True)
+        self.assertIn('original', response.context, response)
+        self.assertTrue(response.context['adminform'].form.errors,
+                        response.context['adminform'].form.errors)
+        m2 = rex.search(str(response), re.M + re.I)
+        self.assertEqual(m1.groups(), m2.groups())

concurrency/tests/forms.py

@@ -1,9 +1,10 @@
 import warnings
-from django.core.exceptions import SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation, ValidationError
 from django.forms.models import modelform_factory
 from django.forms.widgets import HiddenInput, TextInput
 from django.utils.encoding import smart_str
 from django.test import TestCase
+from concurrency.core import InconsistencyError
 from concurrency.forms import ConcurrentForm, VersionField, VersionFieldSigner, VersionWidget
 from concurrency.tests import TestModel0, TestIssue3Model
 from django.test.testcases import SimpleTestCase
@@ -132,3 +133,19 @@ def test_is_valid(self):
         obj.save() # save again simulate concurrent editing
         self.assertRaises(ValueError, form.save)
 
+    def test_form_is_valid(self):
+        obj, __ = TestIssue3Model.objects.get_or_create(username='aaa')
+        Form = modelform_factory(TestIssue3Model, ConcurrentForm)
+        data = {'username': "a",
+                'revision': VersionFieldSigner().sign(1)}
+        form = Form(data)
+        self.assertRaises(InconsistencyError, form.is_valid)
+
+    def test_signing(self):
+        """ Do not accept version value if adding"""
+        obj, __ = TestIssue3Model.objects.get_or_create(username='aaa')
+        Form = modelform_factory(TestIssue3Model, ConcurrentForm)
+        data = {'username': "a",
+                'revision': VersionFieldSigner().sign(1)}
+        form = Form(data)
+        self.assertRaises(InconsistencyError, form.is_valid)

concurrency/tests/middleware.py

@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
+from django.conf import global_settings
+from django.core.urlresolvers import reverse
 from django.http import HttpRequest
 from django.test import TestCase
 from concurrency.core import RecordModifiedError
+from concurrency.forms import VersionFieldSigner
 from concurrency.middleware import ConcurrencyMiddleware
 from concurrency.tests import TestModel0
+from concurrency.tests.contrib_admin import DjangoAdminTestCase
 
 
 class ConcurrencyMiddlewareTest(TestCase):
@@ -32,3 +36,33 @@ def test_process_exception(self):
         request = self._get_request('/')
         r = ConcurrencyMiddleware().process_exception(request, RecordModifiedError(target=m))
         self.assertEqual(r.status_code, 409)
+        # self.assertIn('target', r.context)
+
+
+class CT(DjangoAdminTestCase):
+
+    def setUp(self):
+        DjangoAdminTestCase.setUp(self)
+        m = ['concurrency.middleware.ConcurrencyMiddleware'] + list(global_settings.MIDDLEWARE_CLASSES)
+        self.sett = self.settings(MIDDLEWARE_CLASSES= m)
+        self.sett.enable()
+
+    def test_stack(self):
+        m, __ = TestModel0.objects.get_or_create(username="New", last_name="1")
+        copy = TestModel0.objects.get(pk=m.pk)
+        url = reverse('admin:concurrency_testmodel0_change', args=[m.pk])
+
+        data = {'username': u'new_username',
+                'last_name': None,
+                'version': VersionFieldSigner().sign(m.version),
+                'char_field': None,
+                '_continue': 1,
+                'date_field': '2010-09-01'}
+        copy.save()
+        r = self.client.post(url, data, follow=True)
+        self.assertEqual(r.status_code, 409)
+        self.assertIn('target', r.context)
+        self.assertIn('saved', r.context)
+        self.assertEqual(r.context['saved'].version, copy.version)
+        self.assertEqual(r.context['target'].version, m.version)
+        self.assertEqual(r.context['request_path'], url)

concurrency/views.py

@@ -5,11 +5,11 @@
 from django.template.context import RequestContext
 from django.views.generic.base import TemplateView
 
+# This module is still alpha and should not be used.
 
 class ConflictResponse(HttpResponse):
     status_code = 409
 
-
 handler409 = 'concurrency.views.conflict'
 
 
@@ -41,10 +41,5 @@ def conflict(request, target=None, template_name='409.html'):
     ctx = RequestContext(request, {'target': target,
                                    'saved': saved,
                                    'request_path': request.path})
-    # return http.HttpResponseNotFound(template.render(RequestContext(request, {'request_path': request.path})))
     return ConflictResponse(template.render(ctx))
 
-
-class Http409View(TemplateView):
-    response_class = ConflictResponse
-    template_name = None

tox.ini

@@ -0,0 +1,16 @@
+[tox]
+envlist =
+    py27_django14
+
+[testenv]
+changedir=tests
+commands =
+    django-admin.py test --settings concurren
+
+
+[testenv:py27_django14]
+basepython = python2.7
+setenv =
+    DJANGOVERSION = 1.4.3
+deps =
+    -r{toxinidir}/requirements.pip