Merge pull request #17 from dealertrack/rounded

Rounded bugfixes

.gitignore

@@ -46,3 +46,4 @@ docs/_build
 /.idea
 *.ropeproject
 *.swp
+.venv

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+0.2.1 (2017-04-27)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed bugs in ``RoundedDecimalField``
+
 0.2.0 (2017-04-25)
 ~~~~~~~~~~~~~~~~~~
 

Makefile

@@ -52,11 +52,9 @@ test:
 	python tests/manage.py test ${TEST_FLAGS}
 
 test-coverage: clean-test
-	-coverage run ${COVER_FLAGS} tests/manage.py test ${TEST_FLAGS}
-	@exit_code=$?
-	@-coverage report -m
-	@-coverage html
-	@exit ${exit_code}
+	coverage run ${COVER_FLAGS} tests/manage.py test ${TEST_FLAGS}
+	coverage report -m
+	coverage html
 
 test-all:
 	tox

drf_braces/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 
 __author__ = 'Miroslav Shubernetskiy'
 __email__ = 'miroslav@miki725.com'
-__version__ = '0.2.0'
+__version__ = '0.2.1'

drf_braces/fields/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, print_function, unicode_literals
+
 from ._fields import *  # noqa
 from .custom import *  # noqa
 from .modified import *  # noqa

drf_braces/fields/_fields.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import inspect
 
 from rest_framework import fields

drf_braces/fields/custom.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import inspect
 
 import pytz
@@ -63,18 +63,15 @@ class NumericField(ValueAsTextFieldMixin, fields.IntegerField):
     }
 
 
-__all__ = [name for name, value in locals().items()
-           if inspect.isclass(value) and issubclass(value, fields.Field)]
-
-
 class RoundedDecimalField(fields.DecimalField):
     """
     Currency field subclass of Decimal used for rounding currencies
     to two decimal places.
     """
 
-    def __init__(self, max_digits=100, decimal_places=2, *args, **kwargs):
-        super(fields.DecimalField, self).__init__(
+    def __init__(self, max_digits=None, decimal_places=2, *args, **kwargs):
+        max_digits = max_digits or self.MAX_STRING_LENGTH
+        super(RoundedDecimalField, self).__init__(
             max_digits=max_digits,
             decimal_places=decimal_places,
             *args, **kwargs
@@ -85,3 +82,7 @@ def to_internal_value(self, data):
 
     def validate_precision(self, data):
         return data
+
+
+__all__ = [name for name, value in locals().items()
+           if inspect.isclass(value) and issubclass(value, fields.Field)]

drf_braces/fields/mixins.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 import six
 from rest_framework.fields import CharField, empty

drf_braces/fields/modified.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import inspect
 
 from . import _fields as fields

drf_braces/forms/fields.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 import six
 from dateutil.parser import parse

drf_braces/forms/serializer_form.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import inspect
 
 import six

drf_braces/mixins.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 from .parsers import StrippingJSONParser
 

drf_braces/parsers.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import json
 from collections import OrderedDict
 

drf_braces/serializers/enforce_validation_serializer.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import inspect
 
 from rest_framework import fields, serializers

drf_braces/serializers/form_serializer.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 from collections import OrderedDict
 
 import six

drf_braces/tests/fields/test_custom.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 from collections import OrderedDict
 from decimal import Decimal
@@ -59,14 +59,27 @@ def test_to_internal_value(self):
         self.assertEqual(field.to_internal_value('haha'), 'haha')
 
 
-class TestCurrencyField(unittest.TestCase):
+class TestRoundedDecimalField(unittest.TestCase):
     def test_init(self):
         field = RoundedDecimalField()
         self.assertIsNotNone(field.max_digits)
         self.assertEqual(field.decimal_places, 2)
 
     def test_to_internal_value(self):
         field = RoundedDecimalField()
+        self.assertEqual(field.to_internal_value(5), Decimal('5'))
+        self.assertEqual(field.to_internal_value(5.2), Decimal('5.2'))
+        self.assertEqual(field.to_internal_value(5.23), Decimal('5.23'))
+        self.assertEqual(field.to_internal_value(5.2345), Decimal('5.23'))
+        self.assertEqual(field.to_internal_value(5.2356), Decimal('5.24'))
+        self.assertEqual(field.to_internal_value('5'), Decimal('5'))
+        self.assertEqual(field.to_internal_value('5.2'), Decimal('5.2'))
+        self.assertEqual(field.to_internal_value('5.23'), Decimal('5.23'))
+        self.assertEqual(field.to_internal_value('5.2345'), Decimal('5.23'))
+        self.assertEqual(field.to_internal_value('5.2356'), Decimal('5.24'))
+        self.assertEqual(field.to_internal_value(Decimal('5')), Decimal('5'))
+        self.assertEqual(field.to_internal_value(Decimal('5.2')), Decimal('5.2'))
+        self.assertEqual(field.to_internal_value(Decimal('5.23')), Decimal('5.23'))
         self.assertEqual(field.to_internal_value(Decimal('5.2345')), Decimal('5.23'))
         self.assertEqual(field.to_internal_value(Decimal('5.2356')), Decimal('5.24'))
         self.assertEqual(field.to_internal_value(Decimal('4.2399')), Decimal('4.24'))

drf_braces/tests/fields/test_fields.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 
 from drf_braces.fields import _fields

drf_braces/tests/fields/test_mixins.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 
 import mock

drf_braces/tests/fields/test_modified.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 from decimal import Decimal
 

drf_braces/tests/forms/test_fields.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 from datetime import datetime
 

drf_braces/tests/forms/test_serializer_form.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 from datetime import datetime
 

drf_braces/tests/serializers/test_enforce_validation_serializer.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 
 import mock

drf_braces/tests/serializers/test_form_serialzier.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 from collections import OrderedDict
 from datetime import datetime

drf_braces/tests/test_mixins.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 
 import mock

drf_braces/tests/test_parsers.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import json
 import unittest
 from collections import OrderedDict

drf_braces/tests/test_utils.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import unittest
 
 from rest_framework import fields

drf_braces/utils.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import inspect
 import itertools
 

tests/manage.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import os
 import sys
 

tests/settings.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 import os
 
 import django

tests/urls.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 
 urlpatterns = []

tox.ini

@@ -5,7 +5,6 @@ envlist =
 [testenv]
 basepython =
     py27: python2.7
-    py34: python3.4
     py36: python3.6
     pypy: pypy
     pypy3: pypy3