Merge 1b187a9 into 5b9ae23

LibraryOfCongress · Mar 4, 2019 · 27a7f8c · 27a7f8c
2 parents 5b9ae23 + 1b187a9
commit 27a7f8c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/concordia/converters.py b/concordia/converters.py
@@ -1,7 +1,12 @@
-from django.urls.converters import SlugConverter
+from django.urls.converters import SlugConverter, StringConverter
 
 
 class UnicodeSlugConverter(SlugConverter):
     # This is similar to the slug_unicode_re pattern but is not anchored to the
     # start of the string:
     regex = r"[-\w+]+"
+
+
+class ItemIdConverter(StringConverter):
+    # Allows . in the item ID
+    regex = r"[-a-zA-Z0-9_\.]+"
diff --git a/concordia/tests/utils.py b/concordia/tests/utils.py
@@ -62,8 +62,8 @@ def create_item(
     *,
     project=None,
     title="Test Item",
-    item_id="testitem0123456789",
-    item_url="http://example.com/item/testitem0123456789/",
+    item_id="testitem.0123456789",
+    item_url="http://example.com/item/testitem.0123456789/",
     published=True,
     **kwargs,
 ):

diff --git a/concordia/urls.py b/concordia/urls.py
@@ -12,6 +12,7 @@
 from . import converters, views
 
 register_converter(converters.UnicodeSlugConverter, "uslug")
+register_converter(converters.ItemIdConverter, "item_id")
 
 tx_urlpatterns = (
     [
@@ -35,7 +36,10 @@
             name="project-export-bagit",
         ),
         path(
-            "<uslug:campaign_slug>/<uslug:project_slug>/<slug:item_id>/export/bagit/",
+            (
+                "<uslug:campaign_slug>/<uslug:project_slug>/"
+                "<item_id:item_id>/export/bagit/"
+            ),
             exporter_views.ExportItemToBagIt.as_view(),
             name="item-export-bagit",
         ),
@@ -45,7 +49,10 @@
             name="campaign-report",
         ),
         path(
-            "<uslug:campaign_slug>/<uslug:project_slug>/<slug:item_id>/<uslug:slug>/",
+            (
+                "<uslug:campaign_slug>/<uslug:project_slug>/"
+                "<item_id:item_id>/<uslug:slug>/"
+            ),
             views.AssetDetailView.as_view(),
             name="asset-detail",
         ),
@@ -66,7 +73,7 @@
             name="project-detail",
         ),
         path(
-            "<uslug:campaign_slug>/<uslug:project_slug>/<slug:item_id>/",
+            "<uslug:campaign_slug>/<uslug:project_slug>/<item_id:item_id>/",
             views.ItemDetailView.as_view(),
             name="item-detail",
         ),

diff --git a/exporter/tests/test_view.py b/exporter/tests/test_view.py
@@ -74,7 +74,7 @@ def test_csv_export(self):
             "b'Campaign,Project,Item,ItemId,Asset,"
             "AssetStatus,DownloadUrl,Transcription\\r\\n'"
             "b'Test Campaign,Test Project,Test Item,"
-            "testitem0123456789,TestAsset,completed,"
+            "testitem.0123456789,TestAsset,completed,"
             "http://tile.loc.gov/image-services/"
             "iiif/service:mss:mal:003:0036300:002/full"
             "/pct:25/0/default.jpg,Sample\\r\\n'"