Maxi/django-jsignature
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

PEP8 clean-up

Browse Source
This commit is contained in:
Florent Lebreton
2013-11-20 15:52:21 +01:00
parent 7666e781e5
commit 5c7f1d7037
12 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsignature/fields.py
View File

@@ -4,10 +4,11 @@
"""
import json
from django.db import models
from django.core import validators
from django.core.exceptions import ValidationError
from .forms import (JSignatureField as JSignatureFormField,
JSIGNATURE_EMPTY_VALUES)
from .forms import (
JSignatureField as JSignatureFormField,
JSIGNATURE_EMPTY_VALUES)
class JSignatureField(models.Field):
"""

5
jsignature/forms.py
View File

@@ -10,6 +10,7 @@ from .widgets import JSignatureWidget
JSIGNATURE_EMPTY_VALUES = validators.EMPTY_VALUES + ('[]', )
class JSignatureField(Field):
"""
A field handling a signature capture field with with jSignature
@@ -18,8 +19,8 @@ class JSignatureField(Field):
def to_python(self, value):
"""
Validates that the input can be red as a JSON object. Returns a Python
datetime.date object.
Validates that the input can be red as a JSON object.
Returns a Python list (JSON object unserialized).
"""
if value in JSIGNATURE_EMPTY_VALUES:
return None

3
jsignature/mixins.py
View File

@@ -7,6 +7,7 @@ from django.db import models
from django.utils.translation import ugettext_lazy as _
from .fields import JSignatureField
class JSignatureFieldsMixin(models.Model):
""" Mixin class providing fields to store a signature with jSignature """
signature = JSignatureField(
@@ -24,7 +25,7 @@ class JSignatureFieldsMixin(models.Model):
def save(self, *args, **kwargs):
is_new = self.pk is None
original = not is_new and self.__class__.objects.get(pk=self.pk) or None
original = not is_new and self.__class__.objects.get(pk=self.pk)
if self.signature:
if is_new or self.signature != original.signature:

35
jsignature/settings.py
View File

@@ -1,19 +1,26 @@
from django.conf import settings
JSIGNATURE_WIDTH = getattr(settings, 'JSIGNATURE_WIDTH', 'ratio')
JSIGNATURE_HEIGHT = getattr(settings, 'JSIGNATURE_HEIGHT', 'ratio')
JSIGNATURE_COLOR = getattr(settings, 'JSIGNATURE_COLOR', '#000')
JSIGNATURE_BACKGROUND_COLOR = getattr(settings, 'JSIGNATURE_BACKGROUND_COLOR', '#FFF')
JSIGNATURE_DECOR_COLOR = getattr(settings, 'JSIGNATURE_DECOR_COLOR', '#DDD')
JSIGNATURE_LINE_WIDTH = getattr(settings, 'JSIGNATURE_LINE_WIDTH', 0)
JSIGNATURE_UNDO_BUTTON = getattr(settings, 'JSIGNATURE_UNDO_BUTTON', False)
JSIGNATURE_WIDTH = getattr(
settings, 'JSIGNATURE_WIDTH', 'ratio')
JSIGNATURE_HEIGHT = getattr(
settings, 'JSIGNATURE_HEIGHT', 'ratio')
JSIGNATURE_COLOR = getattr(
settings, 'JSIGNATURE_COLOR', '#000')
JSIGNATURE_BACKGROUND_COLOR = getattr(
settings, 'JSIGNATURE_BACKGROUND_COLOR', '#FFF')
JSIGNATURE_DECOR_COLOR = getattr(
settings, 'JSIGNATURE_DECOR_COLOR', '#DDD')
JSIGNATURE_LINE_WIDTH = getattr(
settings, 'JSIGNATURE_LINE_WIDTH', 0)
JSIGNATURE_UNDO_BUTTON = getattr(
settings, 'JSIGNATURE_UNDO_BUTTON', False)
JSIGNATURE_DEFAULT_CONFIG = {
'width': JSIGNATURE_WIDTH,
'height': JSIGNATURE_HEIGHT,
'color': JSIGNATURE_COLOR,
'background-color': JSIGNATURE_BACKGROUND_COLOR,
'decor-color': JSIGNATURE_DECOR_COLOR,
'lineWidth': JSIGNATURE_LINE_WIDTH,
'UndoButton': JSIGNATURE_UNDO_BUTTON,
'width': JSIGNATURE_WIDTH,
'height': JSIGNATURE_HEIGHT,
'color': JSIGNATURE_COLOR,
'background-color': JSIGNATURE_BACKGROUND_COLOR,
'decor-color': JSIGNATURE_DECOR_COLOR,
'lineWidth': JSIGNATURE_LINE_WIDTH,
'UndoButton': JSIGNATURE_UNDO_BUTTON,
}

9
jsignature/tests/fields.py
View File

@@ -1,9 +1,7 @@
import json
import django
from django.test import SimpleTestCase
from django.core.exceptions import ValidationError
from ..widgets import JSignatureWidget
from ..fields import JSignatureField
from ..forms import JSignatureField as JSignatureFormField
@@ -16,7 +14,7 @@ class JSignatureFieldTest(SimpleTestCase):
for val in ['', [], '[]']:
self.assertIsNone(f.to_python(val))
# Correct values
val = [{"x":[1,2], "y":[3,4]}]
val = [{"x": [1, 2], "y": [3, 4]}]
self.assertEquals(val, f.to_python(val))
val_str = '[{"x":[1,2], "y":[3,4]}]'
self.assertEquals(val, f.to_python(val_str))
@@ -30,7 +28,7 @@ class JSignatureFieldTest(SimpleTestCase):
for val in ['', [], '[]']:
self.assertIsNone(f.get_prep_value(val))
# Correct values
val = [{"x":[1,2], "y":[3,4]}]
val = [{"x": [1, 2], "y": [3, 4]}]
val_prep = f.get_prep_value(val)
self.assertIsInstance(val_prep, basestring)
self.assertEquals(val, json.loads(val_prep))
@@ -44,4 +42,5 @@ class JSignatureFieldTest(SimpleTestCase):
def test_formfield(self):
f = JSignatureField()
self.assertTrue(issubclass(f.formfield().__class__, JSignatureFormField))
cls = f.formfield().__class__
self.assertTrue(issubclass(cls, JSignatureFormField))

4
jsignature/tests/forms.py
View File

@@ -1,5 +1,3 @@
import json
import django
from django.test import SimpleTestCase
from django.core.exceptions import ValidationError
@@ -20,7 +18,7 @@ class JSignatureFormFieldTest(SimpleTestCase):
self.assertIsNone(f.to_python(val))
# Correct values
val = '[{"x":[1,2], "y":[3,4]}]'
self.assertEquals([{'x':[1,2], 'y':[3,4]}], f.to_python(val))
self.assertEquals([{'x': [1, 2], 'y': [3, 4]}], f.to_python(val))
# Incorrect values
val = 'foo'
self.assertRaises(ValidationError, f.to_python, val)

12
jsignature/tests/mixins.py
View File

@@ -1,11 +1,8 @@
import json
import django
from datetime import datetime, date
from datetime import date
from django.conf import settings
from django.db.models import loading
from django.test import SimpleTestCase
from django.core.management import call_command
from django.core.exceptions import ValidationError
from .models import JSignatureTestModel
@@ -24,7 +21,7 @@ class JSignatureFieldsMixinTest(SimpleTestCase):
def test_save(self):
# If an object is created signed, signature date must be set
signature_value = [{"x":[1,2], "y":[3,4]}]
signature_value = [{"x": [1, 2], "y": [3, 4]}]
i = JSignatureTestModel(signature=signature_value)
i.save()
i = JSignatureTestModel.objects.get(pk=i.pk)
@@ -40,8 +37,9 @@ class JSignatureFieldsMixinTest(SimpleTestCase):
self.assertEqual(date(2013, 1, 1), i.signature_date.date())
# If signature changes, signature date must be updated too
new_signature_value = [{"x":[5,6], "y":[7,8]}]
i = JSignatureTestModel(signature=signature_value, signature_date=date(2013, 1, 1))
new_signature_value = [{"x": [5, 6], "y": [7, 8]}]
i = JSignatureTestModel(signature=signature_value,
signature_date=date(2013, 1, 1))
i.save()
i.signature_date = date(2013, 1, 1)
i.signature = new_signature_value

1
jsignature/tests/models.py
View File

@@ -1,5 +1,6 @@
""" Provides a dummy model implementing JSignatureFieldsMixin """
from ..mixins import JSignatureFieldsMixin
class JSignatureTestModel(JSignatureFieldsMixin):
pass

4
jsignature/tests/utils.py
View File

@@ -6,9 +6,11 @@ from django.test import SimpleTestCase
from ..utils import draw_signature
DUMMY_VALUE = [{"x":[205,210],"y":[59,63]},{"x":[205,207],"y":[67,64]}]
DUMMY_VALUE = [{"x": [205, 210], "y": [59, 63]},
{"x": [205, 207], "y": [67, 64]}]
DUMMY_STR_VALUE = json.dumps(DUMMY_VALUE)
class UtilsTest(SimpleTestCase):
def test_inputs(self):

3
jsignature/tests/widgets.py
View File

@@ -1,5 +1,4 @@
import json
import django
from django.test import SimpleTestCase
from django.core.exceptions import ValidationError
@@ -44,7 +43,7 @@ class JSignatureWidgetTest(SimpleTestCase):
for val in ['', [], '[]']:
self.assertEqual('[]', w.prep_value(val))
# Correct values
val = [{"x":[1,2], "y":[3,4]}]
val = [{"x": [1, 2], "y": [3, 4]}]
val_prep = w.prep_value(val)
self.assertIsInstance(val_prep, basestring)
self.assertEquals(val, json.loads(val_prep))

9
jsignature/utils.py
View File

@@ -3,12 +3,11 @@
https://github.com/zivezab/django-autograph/blob/master/autograph/utils.py
"""
import json
import cStringIO
from itertools import chain
from tempfile import NamedTemporaryFile
from PIL import Image, ImageDraw, ImageOps
AA = 5 # super sampling gor antialiasing
AA = 5 # super sampling gor antialiasing
def draw_signature(data, as_file=False):
""" Draw signature based on lines stored in json_string.
@@ -32,7 +31,8 @@ def draw_signature(data, as_file=False):
draw = ImageDraw.Draw(im)
for line in drawing:
len_line = len(line['x'])
points = [(line['x'][i]*AA, line['y'][i]*AA) for i in range(0, len_line)]
points = [(line['x'][i]*AA, line['y'][i]*AA)
for i in range(0, len_line)]
draw.line(points, fill="#000", width=2*AA)
im = ImageOps.expand(im)
# Smart crop
@@ -48,4 +48,3 @@ def draw_signature(data, as_file=False):
ret = im
return ret

12
jsignature/widgets.py
View File

@@ -12,6 +12,7 @@ from jsignature.settings import JSIGNATURE_DEFAULT_CONFIG
JSIGNATURE_EMPTY_VALUES = validators.EMPTY_VALUES + ('[]', )
class JSignatureWidget(HiddenInput):
"""
A widget handling a signature capture field with with jSignature
@@ -67,9 +68,12 @@ class JSignatureWidget(HiddenInput):
hidden_input = super(JSignatureWidget, self).render(name, value, attrs)
div = u'<div id="%s" class="jsign-container"></div>' % jsign_id
clr = u'<input type="button" value="%s" class="btn">' % _('Reset')
js = u'$("#%s").jSignature(%s);' % (jsign_id, json.dumps(jsignature_config))
js += u'$("#%s").jSignature("setData", %s,"native");' % (jsign_id, value)
js = u'<script type="text/javascript">%s</script>' % js
out = u'<div class="jsign-wrapper">%s%s%s%s</div>' % (hidden_input, div, clr, js)
js = u'$("#%s").jSignature(%s);' % (
jsign_id, json.dumps(jsignature_config))
js += u'$("#%s").jSignature("setData", %s,"native");' % (
jsign_id, value)
js = u'<script type="text/javascript">%s</script>' % js
out = u'<div class="jsign-wrapper">%s%s%s%s</div>' % (
hidden_input, div, clr, js)
return mark_safe(out)