fixed upload

Author: tals

box/client.py

@@ -272,7 +272,7 @@ def _check_for_errors(self, response):
     def default_headers(self):
         return self.credentials.headers
 
-    def _request(self, method, resource, params=None, data=None, headers=None, endpoint="api", raw=False, try_refresh=True, **kwargs):
+    def _request(self, method, resource, params=None, data=None, headers=None, endpoint="api", raw=False, try_refresh=True, auto_json=True, **kwargs):
         """
         Performs a HTTP request to Box.
 
@@ -282,15 +282,16 @@ def _request(self, method, resource, params=None, data=None, headers=None, endpo
             - method: The type of HTTP method, f.ex. get or post
             - resource: The resource to request (without shared prefix)
             - params: Any query parameters to send
-            - data: Any data to send. If data is a dict, it will be encoded as json
+            - data: Any data to send. If data is a dict and auto_json is True, it will be encoded as json.
             - headers: Any additional headers
             - endpoint: The endpoint to use, f.ex. api or upload, defaults to api
             - raw: True if the full response should be returned, otherwise the parsed json body will be returned
             - try_refresh: True if a refresh of the credentials should be attempted, False otherwise
+            - auto_json: should data be json-ified automatically.
             - **kwargs: Any addiitonal arguments to pass to the request
         """
 
-        if isinstance(data, dict):
+        if auto_json and isinstance(data, dict):
             data = json.dumps(data)
 
         if headers:
@@ -528,22 +529,31 @@ def upload_file(self, filename, fileobj, parent=0):
         form = {"parent_id": self._get_id(parent)}
 
         # usually Box goes with data==json, but here they want headers (as per standard http form)
-        result = self._request("post", "files/content", endpoint="upload", data=form, files={filename: fileobj})
-        return result['entries'][0]
+        response = requests.post('https://upload.box.com/api/2.0/files/content',
+                                 headers=self.default_headers,
+                                 data=form,
+                                 files={filename: fileobj})
+
+        self._check_for_errors(response)
+        return response.json()['entries'][0]
 
     def overwrite_file(self, file_id, fileobj, etag=None, content_modified_at=None):
         """
         Uploads a file that will overwrite an existing one. The file_id must exist on the server.
         """
-        headers = {}
+        headers = dict(self.default_headers)
         if etag:
             headers['If-Match'] = etag
 
         if content_modified_at:
             headers['content_modified_at'] = content_modified_at.isoformat()
 
-        result = self._request("post", 'files/{}/content'.format(file_id), headers=headers, endpoint="upload", files={'file': fileobj})
-        return result['entries'][0]
+        response = requests.post('https://upload.box.com/api/2.0/files/{}/content'.format(file_id),
+                                 headers=headers,
+                                 files={'file': fileobj})
+
+        self._check_for_errors(response)
+        return response.json()['entries'][0]
 
     def copy_file(self, file_id, destination_parent, new_filename=None):
         """

setup.py

@@ -15,7 +15,7 @@
 
 setup(
     name='box.py',
-    version='1.2',
+    version='1.2.1',
     author='Sookasa',
     author_email='[email protected]',
     url='http://github.com/sookasa/box.py',

tests/test_client.py

@@ -29,12 +29,15 @@ def make_client(self, method, path, params=None, data=None, headers=None, endpoi
         else:
             headers = client.default_headers
 
+        if isinstance(data, dict):
+            data = json.dumps(data)
+
         flexmock(requests) \
             .should_receive('request') \
             .with_args(method,
                        'https://%s.box.com/2.0/%s' % (endpoint, path),
                        params=params,
-                       data=json.dumps(data) if isinstance(data, dict) else data,
+                       data=data,
                        headers=headers,
                        **kwargs) \
             .and_return(mocked_response(result)) \
@@ -373,24 +376,65 @@ def test_get_thumbnail(self):
         self.assertEqual('Thumbnail contents', thumbnail.read())
 
     def test_upload_file(self):
-        client = self.make_client("post", "files/content", endpoint="upload", data={'parent_id': '666'}, files={'hello.jpg': FileObjMatcher('hello world')},
-                                  result={"entries": [{"id": "1"}]})
+        client = BoxClient('my_token')
+        flexmock(client) \
+            .should_receive('_check_for_errors') \
+            .once()
+
+        response = mocked_response({'entries': [{'id': '1'}]})
+        flexmock(requests) \
+            .should_receive('post') \
+            .with_args('https://upload.box.com/api/2.0/files/content',
+                       headers=client.default_headers,
+                       data={'parent_id': '666'},
+                       files={'hello.jpg': FileObjMatcher('hello world')}) \
+            .and_return(response) \
+            .once()
+
         result = client.upload_file('hello.jpg', StringIO('hello world'), parent=666)
         self.assertEqual({'id': '1'}, result)
 
     def test_upload_file_with_parent_as_dict(self):
-        client = self.make_client("post", "files/content", data={'parent_id': '666'},
-                                  files={'hello.jpg': FileObjMatcher('hello world')}, result={"entries": [{"id": "1"}]}, endpoint="upload")
+        client = BoxClient('my_token')
+        flexmock(client) \
+            .should_receive('_check_for_errors') \
+            .once()
+
+        response = mocked_response({'entries': [{'id': '1'}]})
+        flexmock(requests) \
+            .should_receive('post') \
+            .with_args('https://upload.box.com/api/2.0/files/content',
+                       headers=client.default_headers,
+                       data={'parent_id': '666'},
+                       files={'hello.jpg': FileObjMatcher('hello world')}) \
+            .and_return(response) \
+            .once()
+
         result = client.upload_file('hello.jpg', StringIO('hello world'), parent={'id': 666})
         self.assertEqual({'id': '1'}, result)
 
     def test_overwrite_file(self):
+        client = BoxClient('my_token')
+
+        flexmock(client) \
+            .should_receive('_check_for_errors') \
+            .once()
+
         expected_headers = {'content_modified_at': '2006-05-04T03:02:01+00:00',
                             'If-Match': 'some_tag'}
+        expected_headers.update(client.default_headers)
+
+        expected_response = mocked_response({'entries': [{'id': '1'}]})
+        flexmock(requests) \
+            .should_receive('post') \
+            .with_args('https://upload.box.com/api/2.0/files/666/content',
+                       headers=expected_headers,
+                       files={'file': FileObjMatcher('hello world')}) \
+            .and_return(expected_response) \
+            .once()
 
-        client = self.make_client("post", "files/666/content", headers=expected_headers, files={'file': FileObjMatcher('hello world')}, endpoint="upload", result={"entries": [{"id": "1"}]})
         result = client.overwrite_file(666, StringIO('hello world'), etag='some_tag',
-                                       content_modified_at=datetime(2006, 5, 4, 3, 2, 1, 0, tzinfo=UTC()))
+                                       content_modified_at=datetime(2006, 5, 4, 3, 2, 1, 0, tzinfo=UTC()),)
         self.assertEqual({'id': '1'}, result)
 
     def test_copy_file(self):