umap-project 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.1.0"
+VERSION = "2.1.2"

umap/models.py

@@ -1,4 +1,5 @@
 import json
+import operator
 import os
 import time
 import uuid
@@ -471,17 +472,14 @@ class DataLayer(NamedModel):
             "size": self.geojson.storage.size(self.get_version_path(name)),
         }
 
-    def get_versions(self):
+    @property
+    def versions(self):
         root = self.storage_root()
         names = self.geojson.storage.listdir(root)[1]
         names = [name for name in names if self.is_valid_version(name)]
-        names.sort(reverse=True)  # Recent first.
-        return names
-
-    @property
-    def versions(self):
-        names = self.get_versions()
-        return [self.version_metadata(name) for name in names]
+        versions = [self.version_metadata(name) for name in names]
+        versions.sort(reverse=True, key=operator.itemgetter("at"))
+        return versions
 
     def get_version(self, name):
         path = self.get_version_path(name)
@@ -493,8 +491,13 @@ class DataLayer(NamedModel):
 
     def purge_old_versions(self):
         root = self.storage_root()
-        names = self.get_versions()[settings.UMAP_KEEP_VERSIONS :]
-        for name in names:
+        versions = self.versions[settings.UMAP_KEEP_VERSIONS :]
+        for version in versions:
+            name = version["name"]
+            # Should not be in the list, but ensure to not delete the file
+            # currently used in database
+            if self.geojson.name.endswith(name):
+                continue
             try:
                 self.geojson.storage.delete(os.path.join(root, name))
             except FileNotFoundError:
@@ -503,8 +506,12 @@ class DataLayer(NamedModel):
     def purge_gzip(self):
         root = self.storage_root()
         names = self.geojson.storage.listdir(root)[1]
+        prefixes = [f"{self.pk}_"]
+        if self.old_id:
+            prefixes.append(f"{self.old_id}_")
+        prefixes = tuple(prefixes)
         for name in names:
-            if name.startswith(f"{self.pk}_") and name.endswith(".gz"):
+            if name.startswith(prefixes) and name.endswith(".gz"):
                 self.geojson.storage.delete(os.path.join(root, name))
 
     def can_edit(self, user=None, request=None):

umap/static/umap/js/modules/request.js

@@ -146,7 +146,7 @@ export class ServerRequest extends Request {
   _onNOK(error) {
     if (error.status === 403) {
       this.ui.alert({
-        content: message || L._('Action not allowed :('),
+        content: error.message || L._('Action not allowed :('),
         level: 'error',
       })
     }

umap/tests/test_datalayer.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 import pytest
 from django.core.files.base import ContentFile
@@ -60,30 +61,43 @@ def test_clone_should_clone_geojson_too(datalayer):
     assert clone.geojson.path != datalayer.geojson.path
 
 
-def test_should_remove_old_versions_on_save(datalayer, map, settings):
+def test_should_remove_old_versions_on_save(map, settings):
+    datalayer = DataLayerFactory(uuid="0f1161c0-c07f-4ba4-86c5-8d8981d8a813", old_id=17)
     settings.UMAP_KEEP_VERSIONS = 3
-    root = datalayer.storage_root()
+    root = Path(datalayer.storage_root())
     before = len(datalayer.geojson.storage.listdir(root)[1])
-    newer = f"{root}/{datalayer.pk}_1440924889.geojson"
-    medium = f"{root}/{datalayer.pk}_1440923687.geojson"
-    older = f"{root}/{datalayer.pk}_1440918637.geojson"
-    other = f"{root}/123456_1440918637.geojson"
-    for path in [medium, newer, older, other]:
-        datalayer.geojson.storage.save(path, ContentFile("{}"))
-        datalayer.geojson.storage.save(path + ".gz", ContentFile("{}"))
-    assert len(datalayer.geojson.storage.listdir(root)[1]) == 8 + before
+    newer = f"{datalayer.pk}_1440924889.geojson"
+    medium = f"{datalayer.pk}_1440923687.geojson"
+    older = f"{datalayer.pk}_1440918637.geojson"
+    with_old_id = f"{datalayer.old_id}_1440918537.geojson"
+    other = "123456_1440918637.geojson"
+    for path in [medium, newer, older, with_old_id, other]:
+        datalayer.geojson.storage.save(root / path, ContentFile("{}"))
+        datalayer.geojson.storage.save(root / f"{path}.gz", ContentFile("{}"))
+    assert len(datalayer.geojson.storage.listdir(root)[1]) == 10 + before
+    files = datalayer.geojson.storage.listdir(root)[1]
+    # Those files should be present before save, which will purge them
+    assert older in files
+    assert older + ".gz" in files
+    assert with_old_id in files
+    assert with_old_id + ".gz" in files
     datalayer.save()
     files = datalayer.geojson.storage.listdir(root)[1]
     # Flat + gz files, but not latest gz, which is created at first datalayer read.
+    # older and with_old_id should have been removed
     assert len(files) == 5
-    assert os.path.basename(newer) in files
-    assert os.path.basename(medium) in files
-    assert os.path.basename(datalayer.geojson.path) in files
+    assert newer in files
+    assert medium in files
+    assert Path(datalayer.geojson.path).name in files
     # File from another datalayer, purge should have impacted it.
-    assert os.path.basename(other) in files
-    assert os.path.basename(other + ".gz") in files
-    assert os.path.basename(older) not in files
-    assert os.path.basename(older + ".gz") not in files
+    assert other in files
+    assert other + ".gz" in files
+    assert older not in files
+    assert older + ".gz" not in files
+    assert with_old_id not in files
+    assert with_old_id + ".gz" not in files
+    names = [v["name"] for v in datalayer.versions]
+    assert names == [Path(datalayer.geojson.name).name, newer, medium]
 
 
 def test_anonymous_cannot_edit_in_editors_mode(datalayer):

umap/tests/test_datalayer_views.py

@@ -44,6 +44,16 @@ def test_get_with_public_mode(client, settings, datalayer, map):
     assert j["type"] == "FeatureCollection"
 
 
+def test_get_with_x_accel_redirect(client, settings, datalayer, map):
+    settings.UMAP_XSENDFILE_HEADER = "X-Accel-Redirect"
+    url = reverse("datalayer_view", args=(map.pk, datalayer.pk))
+    response = client.get(url)
+    assert response.status_code == 200
+    assert "X-Accel-Redirect" in response.headers
+    assert response["X-Accel-Redirect"].startswith("/internal/datalayer/")
+    assert response["X-Accel-Redirect"].endswith(".geojson")
+
+
 def test_get_with_open_mode(client, settings, datalayer, map):
     map.share_status = Map.PUBLIC
     map.save()

umap/views.py

@@ -1020,8 +1020,8 @@ class DataLayerView(GZipMixin, BaseDetailView):
 
         if getattr(settings, "UMAP_XSENDFILE_HEADER", None):
             response = HttpResponse()
-            path = path.replace(settings.MEDIA_ROOT, "/internal")
-            response[settings.UMAP_XSENDFILE_HEADER] = path
+            internal_path = str(path).replace(settings.MEDIA_ROOT, "/internal")
+            response[settings.UMAP_XSENDFILE_HEADER] = internal_path
         else:
             # Do not use in production
             # (no gzip/cache-control/If-Modified-Since/If-None-Match)
@@ -1073,7 +1073,8 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
         """
 
         # Use the provided info to find the correct version in our storage.
-        for name in self.object.get_versions():
+        for version in self.object.versions:
+            name = version["name"]
             path = Path(settings.MEDIA_ROOT) / self.object.get_version_path(name)
             if reference_version == self.read_version(path):
                 with open(path) as f:

{umap_project-2.1.0.dist-info → umap_project-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 2.1.0
+Version: 2.1.2
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

{umap_project-2.1.0.dist-info → umap_project-2.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=NUYNa7PhqumIE5zRl-LPrL7HPtV6WkBx8Yf93ea7cEs,18
+umap/__init__.py,sha256=g3cxz98sq2sH94EJfsXt9vgetLlENXp3IEKtEY6wMyg,18
 umap/admin.py,sha256=gL6zrexmDbIKIqOKHCuAM5wtqr8FIQkRtjbcXcNyBrs,749
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/autocomplete.py,sha256=WUsbsVBl_KzzEzxB4g3rAoS5-eEvCZGtelVzXeOFV90,444
@@ -8,11 +8,11 @@ umap/fields.py,sha256=c32tKWKF8aThrCXDJblwo0n9n2ET6hxBYzEupfr0B4o,900
 umap/forms.py,sha256=bpNLMSsB1sHUcaf24MmUpwVdEz_SHy_ohfhQMoKwDzI,3128
 umap/managers.py,sha256=-lBK0xYFRDfX76qDRdLnZOA8jEPYseEwIj8QOiHVM4w,243
 umap/middleware.py,sha256=p8EPW_gYW8Wh2lk0DNIAkZQbYlBZugW7Yq4iiA7L4aE,514
-umap/models.py,sha256=Ol1AqtsSwNXCU67yJxCyWxF8EVpHIWLjZy4rcHPHZn0,17180
+umap/models.py,sha256=uraqRRDec7h0DWALb2yMJxaGgYIAN4BZTv8OYnktaWc,17519
 umap/storage.py,sha256=bdjjdn768fZJYsyDNBxgwLvSu6rhde_Cc6yzyZZDmSg,2282
 umap/urls.py,sha256=frMCdfDQ2QB39xxqI8I12EeT-yChn5KDwDp-kQxp930,6876
 umap/utils.py,sha256=19i8ibi-1IXxafT4k_yOHMhD-DsPH74Ll9qw-UrUkM4,5856
-umap/views.py,sha256=o91hRkYlMZP9QjH-BrD_2T4SV40C7vwmhOeBr80ijdg,41020
+umap/views.py,sha256=N2J9BOP5Yq6ClTy2K_11l34pRIgCL4jwvU_n2K_wM8c,41075
 umap/wsgi.py,sha256=IopIgnDZbCus3XpSetTHnra9VyzWi0Y2tJo-CmfTWCY,1132
 umap/bin/__init__.py,sha256=iA3ON4A6NCpenrn3q2OgefUKF5QRFIQS-FtS0pxruI8,234
 umap/locale/am_ET/LC_MESSAGES/django.mo,sha256=xdPMnJ3Z0fkxocaO7IKexPyomuWUKak01D2T6pVruco,5457
@@ -206,7 +206,7 @@ umap/static/umap/js/modules/browser.js,sha256=-RPyTmnd8_d9FhkmL4wP3DlQHkaoA9QIAd
 umap/static/umap/js/modules/global.js,sha256=tp8tCmAqKlSVNPi7w3n9wiMTb5Wh-DVh_XedZz_Lo60,454
 umap/static/umap/js/modules/i18n.js,sha256=5EmqVuxda24BvXPZb8uOXNc21vHs7Rx8RF9fVZsnTR8,1207
 umap/static/umap/js/modules/leaflet-configure.js,sha256=P3aD8iNGxuVNv-xW4Di4txAjNmnlpKtCCzDvPaKEdQ8,243
-umap/static/umap/js/modules/request.js,sha256=7qMUuC5Q2Ql0U8bbojUMSdGMsWrvyqM364j3uF0sLZs,4001
+umap/static/umap/js/modules/request.js,sha256=v10pLYqFcKeQeMTcjC1Vm9wlp5ehRFKQ65HfT7VrYLY,4007
 umap/static/umap/js/modules/schema.js,sha256=vP60-MU4rRowRrRQzWRQbT9vu4Klrp5sRTAy_ZgYyxQ,8926
 umap/static/umap/js/modules/urls.js,sha256=isqV_dslYuNQIErzf5Wgq-oZqORRK4as6e78sfQgaUo,1308
 umap/static/umap/js/modules/utils.js,sha256=sjCXiF3fb86evhDDJBDSRHjXTYTcKtjeC7SoNpFl680,558
@@ -429,8 +429,8 @@ umap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/tests/base.py,sha256=WcrRnmgcTvx9hHekIJsGyVhFwvyNrgT7PYQ6DPwuAZU,4200
 umap/tests/conftest.py,sha256=hlUPzNq7JakJnT2k5LOp7a8CKhHBWhz3v9EwioPOVUg,1367
 umap/tests/settings.py,sha256=qzKYcWzVXUVYxNdv8m7lLV-xkNrV8A8-LWliTJagHOE,716
-umap/tests/test_datalayer.py,sha256=1C2z0VACCime11CMbp9ehbj-knLpW8r6j72EQ_hKLU4,6322
-umap/tests/test_datalayer_views.py,sha256=CG0ycp-z3brvsC8bwOjPzeCevue-nS357nHSDGAbyTI,21662
+umap/tests/test_datalayer.py,sha256=HJYSQ11LVQe47nnsXdFeX5Ny4WMDPUYg3frnM5G1IzQ,6888
+umap/tests/test_datalayer_views.py,sha256=AJ-0YBorAgKZaKGd8rSYDguqy8acrz54EaQdfkNOH48,22111
 umap/tests/test_licence.py,sha256=BxNY3gdKhIoc2u5OPmAkmjCp0jJN-Jm-uPOfAZlpOHA,339
 umap/tests/test_map.py,sha256=nX2eE1HJY3bjycXulglK2SY1ybcnjDVgr0yntX6OgyA,3836
 umap/tests/test_map_views.py,sha256=6EW0jqDepS8y117sfCbDwmhnhu0vHup3GXE57IrkAnI,31350
@@ -472,8 +472,8 @@ umap/tests/integration/test_slideshow.py,sha256=uLPw4SyhLgpqU4-jrTu5vKSqYuZG7hXj
 umap/tests/integration/test_star.py,sha256=icB5SbFbXe4KYp3DIJ0xAwCrSQS2rweqIaQTAng3CfY,842
 umap/tests/integration/test_statics.py,sha256=UqaN2O56yHwn1tEE9I8B1lGnyztDLC0p7_rG6J7vLIs,1494
 umap/tests/integration/test_tilelayer.py,sha256=3Jn1KdOM39DuDkLG-P3heDrsCiYvD6_FEnt0EKGjj5g,4141
-umap_project-2.1.0.dist-info/METADATA,sha256=WjxOBkcnYktf5E_US6kyu9jzuBYh_W3GePuO9i3IM90,2559
-umap_project-2.1.0.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
-umap_project-2.1.0.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-2.1.0.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-2.1.0.dist-info/RECORD,,
+umap_project-2.1.2.dist-info/METADATA,sha256=pEqfRBAX0YjxA4wm2SBm7eYsska6n0IjIwwjU0GnoKQ,2559
+umap_project-2.1.2.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
+umap_project-2.1.2.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-2.1.2.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-2.1.2.dist-info/RECORD,,