Use proper path converter for lemonshort

main
Danielle McLean 9 months ago
parent cfeb206154
commit 683adc1b46
  1. 11
      lemonshort/convert.py
  2. 4
      lemonshort/short_url.py
  3. 8
      lemonshort/tests/convert.py
  4. 7
      lemonshort/urls.py
  5. 4
      lemonshort/views.py

@ -6,10 +6,11 @@ from string import ascii_lowercase, ascii_uppercase
chars = ascii_uppercase + ascii_lowercase
conv = BaseConverter(chars)
class AbcIdConverter:
regex = '[a-zA-Z]+'
def abc_to_id(abc):
return int(conv.decode(abc))
def to_python(self, value: str) -> int:
return int(conv.decode(value))
def id_to_abc(id):
return conv.encode(id)
def to_url(self, value: int) -> str:
return conv.encode(value)

@ -2,7 +2,7 @@ from django.apps import apps
from django.conf import settings
from typing import Any, Dict, Type
from .convert import id_to_abc
from .convert import AbcIdConverter
prefixes = {} # type: Dict[Type[Any], str]
@ -14,4 +14,4 @@ def short_url(entity):
base = '/'
if hasattr(settings, 'SHORT_BASE_URL'):
base = settings.SHORT_BASE_URL
return base + prefixes[type(entity)] + id_to_abc(entity.id)
return base + prefixes[type(entity)] + AbcIdConverter().to_url(entity.id)

@ -1,7 +1,7 @@
from .. import convert
def test_abc_to_id():
def test_to_python():
samples = {
'A': 0,
'B': 1,
@ -12,8 +12,9 @@ def test_abc_to_id():
'BA': 52,
'BAB': 2705,
}
converter = convert.AbcIdConverter()
for abc, id in samples.items():
assert convert.abc_to_id(abc) == id
assert converter.to_python(abc) == id
def test_id_to_abc():
@ -26,5 +27,6 @@ def test_id_to_abc():
104: 'CA',
130: 'Ca',
}
converter = convert.AbcIdConverter()
for id, abc in samples.items():
assert convert.id_to_abc(id) == abc
assert converter.to_url(id) == abc

@ -1,10 +1,13 @@
from django.conf import settings
from django.urls import path
from django.urls import path, register_converter
from .convert import AbcIdConverter
from .views import unshort
register_converter(AbcIdConverter, 'abc_id')
app_name = 'lemonshort'
urlpatterns = tuple(
path('{0!s}<tiny>'.format(k), unshort, name=m, kwargs={'model': m})
path('{0!s}<abc_id:tiny>'.format(k), unshort, name=m, kwargs={'model': m})
for k, m in settings.SHORTEN_MODELS.items()
)

@ -1,9 +1,9 @@
from django.apps import apps
from django.shortcuts import get_object_or_404, redirect
from .convert import abc_to_id
from .convert import AbcIdConverter
def unshort(request, model, tiny):
entity = get_object_or_404(apps.get_model(model), pk=abc_to_id(tiny))
entity = get_object_or_404(apps.get_model(model), pk=tiny)
return redirect(entity, permanent=True)

Loading…
Cancel
Save