Fix #118 -- Support custom AWS locations without a trailing slash

Author: codingjoe

s3file/middleware.py

@@ -1,6 +1,6 @@
 import json
 import logging
-import os
+import pathlib
 
 from s3file.storages import local_dev, storage
 
@@ -28,11 +28,10 @@ def __call__(self, request):
     def get_files_from_storage(paths):
         """Return S3 file where the name does not include the path."""
         for path in paths:
-            if storage.location:
-                path = path.replace(os.path.dirname(storage.location) + "/", "", 1)
+            path = pathlib.PurePosixPath(path)
             try:
-                f = storage.open(path)
-                f.name = os.path.basename(path)
+                f = storage.open(path.relative_to(storage.location))
+                f.name = path.name
                 yield f
-            except OSError:
+            except (OSError, ValueError):
                 logger.exception("File not found: %s", path)

tests/test_middleware.py

@@ -1,3 +1,5 @@
+import os
+
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
 
@@ -11,7 +13,9 @@ def test_get_files_from_storage(self):
         name = storage.save(
             "tmp/s3file/test_get_files_from_storage", ContentFile(content)
         )
-        files = S3FileMiddleware.get_files_from_storage([name])
+        files = S3FileMiddleware.get_files_from_storage(
+            [os.path.join(storage.location, name)]
+        )
         file = next(files)
         assert file.read() == content