Merge pull request #48 from mapio/master

Ensure that BinaryFields are converted to `binary_type` (#48, #46)

Author: rozza

flask_mongoengine/wtf/fields.py

@@ -9,7 +9,7 @@
 from wtforms.validators import ValidationError
 
 from mongoengine.queryset import DoesNotExist
-from mongoengine.python_support import txt_type
+from mongoengine.python_support import txt_type, bin_type
 
 __all__ = (
     'ModelSelectField', 'QuerySetSelectField',
@@ -161,3 +161,11 @@ def process_formdata(self, valuelist):
         if self.data == "":
             self.data = None
 
+class BinaryField(TextAreaField):
+    """
+    Custom TextAreaField that converts its value with bin_type.
+    """
+
+    def process_formdata(self, valuelist):
+        if valuelist:
+            self.data = bin_type( valuelist[0] )

flask_mongoengine/wtf/orm.py

@@ -14,7 +14,7 @@
 from wtforms import fields as f, validators
 from mongoengine import ReferenceField
 
-from flask.ext.mongoengine.wtf.fields import ModelSelectField, ModelSelectMultipleField, DictField, NoneStringField
+from flask.ext.mongoengine.wtf.fields import ModelSelectField, ModelSelectMultipleField, DictField, NoneStringField, BinaryField
 from flask.ext.mongoengine.wtf.models import ModelForm
 
 __all__ = (
@@ -143,7 +143,7 @@ def conv_Binary(self, model, field, kwargs):
         #TODO: may be set file field that will save file`s data to MongoDB
         if field.max_bytes:
             kwargs['validators'].append(validators.Length(max=field.max_bytes))
-        return f.TextAreaField(**kwargs)
+        return BinaryField(**kwargs)
 
     @converts('DictField')
     def conv_Dict(self, model, field, kwargs):

tests/test_forms.py

@@ -32,6 +32,19 @@ def setUp(self):
     def tearDown(self):
         self.db.connection.drop_database(self.db_name)
 
+    def test_binaryfield(self):
+
+        with self.app.test_request_context('/'):
+            db = self.db
+
+            class Binary(db.Document):
+                binary = db.BinaryField()
+
+            BinaryForm = model_form(Binary)
+            form = BinaryForm(MultiDict({'binary': '1'}))
+            self.assertTrue(form.validate())
+            form.save()
+
     def test_choices_coerce(self):
 
         with self.app.test_request_context('/'):