Fix missing options in CloudinaryJsFileField

Fix bug introduced in Django 1.11:
https://code.djangoproject.com/ticket/28095

Fixes #190

Author: const-cloudinary

cloudinary/forms.py

@@ -18,7 +18,7 @@ class CloudinaryInput(forms.TextInput):
     input_type = 'file'
 
     def render(self, name, value, attrs=None, renderer=None):
-        attrs = self.build_attrs(attrs)
+        attrs = dict(self.attrs, **attrs)
         options = attrs.get('options', {})
         attrs["options"] = ''
 

django_tests/forms.py

@@ -0,0 +1,16 @@
+from django import forms
+
+from cloudinary.forms import CloudinaryJsFileField
+
+
+class CloudinaryJsTestFileForm(forms.Form):
+    js_file_field = CloudinaryJsFileField(
+        attrs={
+            'style': "margin-top: 30px"
+        },
+        options={
+            'tags': "directly_uploaded",
+            'crop': 'limit', 'width': 1000, 'height': 1000,
+            'eager': [{'crop': 'fill', 'width': 150, 'height': 100}]
+        }
+    )

django_tests/test_cloudinary_file_field.py

@@ -1,13 +1,11 @@
-import os
-
-from mock import mock
-
-import cloudinary
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
+from mock import mock
 
-from cloudinary import api, CloudinaryResource
+import cloudinary
+from cloudinary import CloudinaryResource
 from cloudinary.forms import CloudinaryFileField
+from django_tests.forms import CloudinaryJsTestFileForm
 from django_tests.helper_test import SUFFIX, TEST_IMAGE, TEST_IMAGE_W, TEST_IMAGE_H
 
 API_TEST_ID = "dj_test_{}".format(SUFFIX)
@@ -17,13 +15,14 @@ class TestCloudinaryFileField(TestCase):
     def setUp(self):
         self.test_file = SimpleUploadedFile(TEST_IMAGE, b'content')
 
-    def test_to_python(self):
+    def test_file_field(self):
         cff_no_auto_save = CloudinaryFileField(autosave=False)
         res = cff_no_auto_save.to_python(None)
         self.assertIsNone(res)
         # without auto_save File is untouched
         res = cff_no_auto_save.to_python(self.test_file)
         self.assertIsInstance(res, SimpleUploadedFile)
+
         # when auto_save is used, resource is uploaded to Cloudinary and CloudinaryResource is returned
         cff_auto_save = CloudinaryFileField(autosave=True, options={"public_id": API_TEST_ID})
         mocked_resource = cloudinary.CloudinaryResource(metadata={"width": TEST_IMAGE_W, "height": TEST_IMAGE_H},
@@ -36,5 +35,15 @@ def test_to_python(self):
         self.assertIsInstance(res, CloudinaryResource)
         self.assertEqual(API_TEST_ID, res.public_id)
 
+    def test_js_file_field(self):
+        js_file_form = CloudinaryJsTestFileForm()
+
+        rendered_form = js_file_form.as_p()
+
+        self.assertIn("margin-top: 30px", rendered_form)
+        self.assertIn("directly_uploaded", rendered_form)
+        self.assertIn("c_fill,h_100,w_150", rendered_form)
+        self.assertIn("c_limit,h_1000,w_1000", rendered_form)
+
     def tearDown(self):
         pass