rename simple_api_cache → api_etag to avoid confusion

src/c3nav/editor/api.py

@@ -10,7 +10,7 @@ from shapely.ops import cascaded_union
 
 from c3nav.editor.models import ChangeSet
 from c3nav.editor.views.base import etag_func
-from c3nav.mapdata.api import simple_api_cache
+from c3nav.mapdata.api import api_etag
 from c3nav.mapdata.models import Area, Door, MapUpdate, Source
 from c3nav.mapdata.models.geometry.space import POI
 
@@ -69,7 +69,7 @@ class EditorViewSet(ViewSet):
 
     # noinspection PyPep8Naming
     @list_route(methods=['get'])
-    @simple_api_cache(etag_func)
+    @api_etag(etag_func)
     def geometries(self, request, *args, **kwargs):
         request.changeset = ChangeSet.get_for_request(request)
 
@@ -192,7 +192,7 @@ class EditorViewSet(ViewSet):
             raise ValidationError('No level or space specified.')
 
     @list_route(methods=['get'])
-    @simple_api_cache(MapUpdate.current_cache_key)
+    @api_etag(MapUpdate.current_cache_key)
     def geometrystyles(self, request, *args, **kwargs):
         return Response({
             'building': '#aaaaaa',
@@ -212,7 +212,7 @@ class EditorViewSet(ViewSet):
         })
 
     @list_route(methods=['get'])
-    @simple_api_cache(etag_func)
+    @api_etag(etag_func)
     def bounds(self, request, *args, **kwargs):
         return Response({
             'bounds': Source.max_bounds(),

src/c3nav/mapdata/api.py

@@ -34,7 +34,7 @@ def optimize_query(qs):
     return qs
 
 
-def simple_api_cache(permissions=True, etag_func=AccessPermission.etag_func):
+def api_etag(permissions=True, etag_func=AccessPermission.etag_func):
     def wrapper(func):
         @wraps(func)
         def wrapped_func(self, request, *args, **kwargs):
@@ -58,7 +58,7 @@ class MapViewSet(ViewSet):
     """
 
     @list_route(methods=['get'])
-    @simple_api_cache(permissions=False)
+    @api_etag(permissions=False)
     def bounds(self, request, *args, **kwargs):
         return Response({
             'bounds': Source.max_bounds(),
@@ -72,7 +72,7 @@ class MapdataViewSet(ReadOnlyModelViewSet):
             return qs.model.qs_for_request(self.request)
         return qs
 
-    @simple_api_cache()
+    @api_etag()
     def list(self, request, *args, **kwargs):
         qs = optimize_query(self.get_queryset())
         geometry = ('geometry' in request.GET)
@@ -120,7 +120,7 @@ class MapdataViewSet(ReadOnlyModelViewSet):
                 qs = qs.filter(on_top_of=level)
         return Response([obj.serialize(geometry=geometry) for obj in qs.order_by('id')])
 
-    @simple_api_cache()
+    @api_etag()
     def retrieve(self, request, *args, **kwargs):
         return Response(self.get_object().serialize())
 
@@ -136,12 +136,12 @@ class LevelViewSet(MapdataViewSet):
     queryset = Level.objects.all()
 
     @list_route(methods=['get'])
-    @simple_api_cache(permissions=False)
+    @api_etag(permissions=False)
     def geometrytypes(self, request):
         return self.list_types(get_submodels(LevelGeometryMixin))
 
     @detail_route(methods=['get'])
-    @simple_api_cache()
+    @api_etag()
     def svg(self, request, pk=None):
         level = self.get_object()
         response = HttpResponse(level.render_svg(request), 'image/svg+xml')
@@ -158,7 +158,7 @@ class SpaceViewSet(MapdataViewSet):
     queryset = Space.objects.all()
 
     @list_route(methods=['get'])
-    @simple_api_cache(permissions=False)
+    @api_etag(permissions=False)
     def geometrytypes(self, request):
         return self.list_types(get_submodels(SpaceGeometryMixin))
 
@@ -223,7 +223,7 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
     queryset = LocationSlug.objects.all()
     lookup_field = 'slug'
 
-    @simple_api_cache()
+    @api_etag()
     def list(self, request, *args, **kwargs):
         searchable = 'searchable' in request.GET
         detailed = 'detailed' in request.GET
@@ -246,7 +246,7 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
 
         return Response(result)
 
-    @simple_api_cache()
+    @api_etag()
     def retrieve(self, request, slug=None, *args, **kwargs):
         show_redirects = 'show_redirects' in request.GET
         detailed = 'detailed' in request.GET
@@ -265,7 +265,7 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
                                            geometry=geometry, simple_geometry=True))
 
     @list_route(methods=['get'])
-    @simple_api_cache(permissions=False)
+    @api_etag(permissions=False)
     def types(self, request):
         return MapdataViewSet.list_types(get_submodels(Location), geomtype=False)
 
@@ -274,7 +274,7 @@ class SourceViewSet(MapdataViewSet):
     queryset = Source.objects.all()
 
     @detail_route(methods=['get'])
-    @simple_api_cache()
+    @api_etag()
     def image(self, request, pk=None):
         return self._image(request, pk=pk)