Merge branch 'release/3.0.1'

Author: Bartek Kwiecien

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Filestack-Python Changelog
 
+### 3.0.1 (July 22nd, 2019)
+- Added enhance presets
+- Set filelink security when uploading from url
+
 ### 3.0.0 (July 16th, 2019)
 - Dropped support for Python 2.7
 - client.upload() now handles local files and file-like objects, accepts keyword arguments only

VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

filestack/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.0.0'
+__version__ = '3.0.1'
 from .models.client import Client
 from .models.filelink import Filelink
 from .models.security import Security

filestack/mixins/imagetransformation.py

@@ -94,7 +94,7 @@ def collage(self, files=None, margin=None, width=None, height=None, color=None,
     def upscale(self, upscale=None, noise=None, style=None):
         return self._add_transform_task('upscale', locals())
 
-    def enhance(self):
+    def enhance(self, preset=None):
         return self._add_transform_task('enhance', locals())
 
     def redeye(self):

filestack/models/client.py

@@ -119,8 +119,9 @@ def upload_url(self, url, store_params=None, security=None):
         Returns:
             :class:`filestack.Filelink`: new Filelink object
         """
-        handle = upload_external_url(url, self.apikey, store_params, security=security or self.security)
-        return filestack.models.Filelink(handle=handle)
+        sec = security or self.security
+        handle = upload_external_url(url, self.apikey, store_params, security=sec)
+        return filestack.models.Filelink(handle=handle, security=sec)
 
     def upload(self, *, filepath=None, file_obj=None, store_params=None, intelligent=False, security=None):
         """

tests/client_test.py

@@ -6,7 +6,7 @@
 from httmock import urlmatch, HTTMock, response
 
 import filestack.models
-from filestack import Client, Filelink, Transformation
+from filestack import Client, Filelink, Transformation, Security
 from tests.helpers import DummyHttpResponse
 
 
@@ -50,6 +50,24 @@ def test_store_filepath(upload_mock, client):
     upload_mock.assert_called_once_with('APIKEY', 'path/to/image.jpg', None, 'S3', params=None, security=None)
 
 
+@patch('filestack.models.client.multipart_upload')
+@patch('filestack.models.client.upload_external_url')
+def test_security_inheritance(upload_external_mock, multipart_mock):
+    upload_external_mock.return_value = 'URL_HANDLE'
+    multipart_mock.return_value = {'handle': 'FILE_HANDLE'}
+
+    policy = {'expiry': 1900}
+    cli = Client(APIKEY, security=Security(policy, 'SECRET'))
+
+    flink_from_url = cli.upload_url('https://just.some/url')
+    assert flink_from_url.handle == 'URL_HANDLE'
+    assert flink_from_url.security.policy == policy
+
+    flink = cli.upload(filepath='/dummy/path')
+    assert flink.handle == 'FILE_HANDLE'
+    assert flink.security.policy == policy
+
+
 def test_url_screenshot(client):
     external_url = 'https//www.someexternalurl'
     transform = client.urlscreenshot(external_url)