Merge pull request derek-schaefer#11 from robthehall/master

Make (en|de)coder_kwargs optional

Author: derek-schaefer

json_field/forms.py

@@ -8,8 +8,8 @@ class JSONFormField(fields.Field):
 
     def __init__(self, *args, **kwargs):
         self.simple = kwargs.pop('simple', False)
-        self.encoder_kwargs = kwargs.pop('encoder_kwargs')
-        self.decoder_kwargs = kwargs.pop('decoder_kwargs')
+        self.encoder_kwargs = kwargs.pop('encoder_kwargs', {})
+        self.decoder_kwargs = kwargs.pop('decoder_kwargs', {})
         super(JSONFormField, self).__init__(*args, **kwargs)
 
     def clean(self, value):

test_project/app/forms.py

@@ -0,0 +1,6 @@
+from json_field.forms import JSONFormField
+
+from django.forms import Form
+
+class TestForm(Form):
+    json = JSONFormField()

test_project/app/tests.py

@@ -1,4 +1,5 @@
 from test_project.app.models import Test
+from test_project.app.forms import TestForm
 
 from django.test import TestCase
 from django.db.utils import IntegrityError
@@ -100,3 +101,9 @@ def test_strings(self):
         t4 = Test.objects.create(json='"a')
         self.assertEqual('"a', t4.json)
         self.assertEqual('"\\"a"', t4.get_json_json())
+
+    def test_formfield(self):
+        data = {'json': '{}'}
+        f1 = TestForm(data)
+        self.assertTrue(f1.is_valid())
+        self.assertEqual(f1.cleaned_data, data)