Release 1.22.2 (#167)

* Fix content disposition

* Pin moto because of breaking changes in version 5.0 +

* Bump version: 1.22.1 → 1.22.2

---------

Co-authored-by: Christian Stefanescu <christian.stefanescu@occrp.org>

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.22.1
+current_version = 1.22.2
 commit = True
 tag = True
 

servicelayer/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__version__ = "1.22.1"
+__version__ = "1.22.2"
 
 
 logging.getLogger("boto3").setLevel(logging.WARNING)

servicelayer/archive/gs.py

@@ -161,7 +161,7 @@ def generate_url(self, content_hash, file_name=None, mime_type=None, expire=None
             return
         disposition = None
         if file_name is not None:
-            disposition = "inline; filename=%s" % file_name
+            disposition = "attachment; filename=%s" % file_name
         if expire is None:
             expire = datetime.utcnow() + timedelta(seconds=self.TIMEOUT)
         return blob.generate_signed_url(

servicelayer/archive/s3.py

@@ -146,7 +146,7 @@ def generate_url(self, content_hash, file_name=None, mime_type=None, expire=None
         if mime_type is not None:
             params["ResponseContentType"] = mime_type
         if file_name is not None:
-            disposition = "inline; filename=%s" % file_name
+            disposition = "attachment; filename=%s" % file_name
             params["ResponseContentDisposition"] = disposition
         expires_in = self.TIMEOUT
         if expire is not None:

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="servicelayer",
-    version="1.22.1",
+    version="1.22.2",
     description="Basic remote service functions for alephdata components",
     classifiers=[
         "Development Status :: 3 - Alpha",

tests/archive/test_s3.py

@@ -1,4 +1,5 @@
 from unittest import TestCase
+from urllib.parse import urlparse, parse_qs
 
 from moto import mock_s3
 
@@ -30,10 +31,28 @@ def test_basic_archive_with_checksum(self):
         assert checksum_ == out, (checksum_, out)
 
     def test_generate_url(self):
-        out = self.archive.archive_file(self.file)
-        url = self.archive.generate_url(out)
-        # assert False, url
-        assert url is not None, url
+        content_hash = self.archive.archive_file(self.file)
+        url = self.archive.generate_url(content_hash)
+        assert url is not None
+
+        url = urlparse(url)
+        assert url.netloc == "foo.s3.amazonaws.com"
+
+    def test_generate_url_headers(self):
+        content_hash = self.archive.archive_file(self.file)
+        url = self.archive.generate_url(
+            content_hash,
+            file_name="test.txt",
+            mime_type="text/plain",
+        )
+        assert url is not None
+
+        url = urlparse(url)
+        query = parse_qs(url.query)
+        assert query["response-content-type"] == ["text/plain"]
+        assert query["response-content-disposition"] == [
+            "attachment; filename=test.txt"
+        ]
 
     def test_publish_file(self):
         assert self.archive.can_publish