Merge pull request #85 from frictionlessdata/issue-84-upload-not-wroking-properly

Fix #84: Get uploaded datapackage file from request

Author: amercader

ckanext/datapackager/controllers/datapackage.py

@@ -46,10 +46,14 @@ def import_datapackage():
 
     try:
         if hasattr(toolkit.request, "form") and len(list(toolkit.request.form.keys())) > 0:
-            params = toolkit.request.form
+            params = toolkit.request.form.to_dict()
         else:
             params = toolkit.request.params
 
+        if toolkit.check_ckan_version(min_version="2.9"):
+            if 'upload' in toolkit.request.files:
+                params['upload'] = toolkit.request.files['upload']
+
         dataset = toolkit.get_action('package_create_from_datapackage')(
             context,
             params,

ckanext/datapackager/logic/action/create.py

@@ -88,7 +88,10 @@ def _load_and_validate_datapackage(url=None, upload=None):
     try:
 
         if _upload_attribute_is_valid(upload):
-            dp = datapackage.DataPackage(upload.file)
+            if toolkit.check_ckan_version(min_version="2.9"):
+                dp = datapackage.DataPackage(upload)
+            else:
+                dp = datapackage.DataPackage(upload.file)
         else:
 
             dp = datapackage.DataPackage(url)
@@ -180,16 +183,20 @@ def _create_and_upload_local_resource(context, resource):
 def _create_and_upload_resource(context, resource, the_file):
     resource['url'] = 'url'
     resource['url_type'] = 'upload'
-    resource['upload'] = FileStorage(the_file, the_file.name, the_file.name)
+
+    if toolkit.check_ckan_version(min_version="2.9"):
+        resource['upload'] = FileStorage(the_file, the_file.name, the_file.name)
+    else:
+        resource['upload'] = _UploadLocalFileStorage(the_file)
 
     toolkit.get_action('resource_create')(context, resource)
 
 
 def _upload_attribute_is_valid(upload):
-    return hasattr(upload, 'file') and hasattr(upload.file, 'read')
-
+    return hasattr(upload, 'read') or hasattr(upload, 'file') and hasattr(upload.file, 'read')
 
-class _UploadLocalFileStorage(FileStorage):
+# Used only in CKAN < 2.9
+class _UploadLocalFileStorage(cgi.FieldStorage):
     def __init__(self, fp, *args, **kwargs):
         self.name = fp.name
         self.filename = fp.name

ckanext/datapackager/tests/logic/action/test_create.py

@@ -1,6 +1,6 @@
 import json
 import tempfile
-from six import StringIO
+from six import StringIO, BytesIO
 import six
 try:
     from unittest import mock
@@ -48,9 +48,11 @@ def test_it_raises_if_datapackage_is_unsafe(self):
             ]
         }
 
-        upload = mock.MagicMock()
-        upload.file = StringIO(json.dumps(datapackage))
-
+        if toolkit.check_ckan_version(min_version="2.9"):
+            upload = StringIO(json.dumps(datapackage))
+        else:
+            upload = mock.MagicMock()
+            upload.file = StringIO(json.dumps(datapackage))
 
         with pytest.raises(toolkit.ValidationError):
             helpers.call_action('package_create_from_datapackage', upload=upload)
@@ -299,7 +301,7 @@ def test_it_allows_uploading_a_datapackage(self):
             tmpfile.flush()
 
             dataset = helpers.call_action('package_create_from_datapackage',
-                                          upload=_UploadFile(tmpfile))
+                                          upload=tmpfile)
             assert dataset['name'] == 'foo'