From f1251e8c58e86db11028396d79f01db5dfcf9e52 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 4 Jun 2013 20:59:12 +0100
Subject: Added trailing_slash argument to routers.  Closes #905

---
 rest_framework/routers.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'rest_framework/routers.py')

diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index 6c5fd004..9764e569 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -18,7 +18,6 @@ from __future__ import unicode_literals
 from collections import namedtuple
 from rest_framework import views
 from rest_framework.compat import patterns, url
-from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.urlpatterns import format_suffix_patterns
@@ -72,7 +71,7 @@ class SimpleRouter(BaseRouter):
     routes = [
         # List route.
         Route(
-            url=r'^{prefix}/$',
+            url=r'^{prefix}{trailing_slash}$',
             mapping={
                 'get': 'list',
                 'post': 'create'
@@ -82,7 +81,7 @@ class SimpleRouter(BaseRouter):
         ),
         # Detail route.
         Route(
-            url=r'^{prefix}/{lookup}/$',
+            url=r'^{prefix}/{lookup}{trailing_slash}$',
             mapping={
                 'get': 'retrieve',
                 'put': 'update',
@@ -95,7 +94,7 @@ class SimpleRouter(BaseRouter):
         # Dynamically generated routes.
         # Generated using @action or @link decorators on methods of the viewset.
         Route(
-            url=r'^{prefix}/{lookup}/{methodname}/$',
+            url=r'^{prefix}/{lookup}/{methodname}{trailing_slash}$',
             mapping={
                 '{httpmethod}': '{methodname}',
             },
@@ -104,6 +103,10 @@ class SimpleRouter(BaseRouter):
         ),
     ]
 
+    def __init__(self, trailing_slash=True):
+        self.trailing_slash = trailing_slash and '/' or ''
+        super(SimpleRouter, self).__init__()
+
     def get_default_base_name(self, viewset):
         """
         If `base_name` is not specified, attempt to automatically determine
@@ -193,7 +196,11 @@ class SimpleRouter(BaseRouter):
                     continue
 
                 # Build the url pattern
-                regex = route.url.format(prefix=prefix, lookup=lookup)
+                regex = route.url.format(
+                    prefix=prefix,
+                    lookup=lookup,
+                    trailing_slash=self.trailing_slash
+                )
                 view = viewset.as_view(mapping, **route.initkwargs)
                 name = route.name.format(basename=basename)
                 ret.append(url(regex, view, name=name))
-- 
cgit v1.2.3