Merge branch 'v0.1.14'

Author: marcgibbons

README.md

@@ -121,6 +121,7 @@ Many thanks to Tom Christie & all the contributors who have developed [Django RE
 * Darren Thompson (@WhiteDawn)
 * Lukasz Balcerzak (@lukaszb)
 * David Newgas (@davidn)
+* Bozidar Benko (@bbenko)
 
 
 ### Django REST Framework Docs contributors:
@@ -132,6 +133,9 @@ Many thanks to Tom Christie & all the contributors who have developed [Django RE
 
 ## Release Notes:
 
+### v0.1.14 (March 7, 2014)
+* Fixed resource name truncation bug
+
 ### v0.1.13 (Feb 25, 2014)
 * Fixed grouping bug
 

dist/django-rest-swagger-0.1.14.tar.gz

@@ -1,4 +1,4 @@
-VERSION = '0.1.13'
+VERSION = '0.1.14'
 
 DEFAULT_SWAGGER_SETTINGS = {
     'exclude_namespaces': [],

rest_framework_swagger/__init__.py

@@ -78,6 +78,18 @@ def test_flatten_url_tree_url_import(self):
 
         self.assertEqual(len(self.url_patterns), len(apis))
 
+    def test_resources_starting_with_letters_from_base_path(self):
+        base_path = r'api/'
+        url_patterns = patterns('',
+                                url(r'test', MockApiView.as_view(), name='a test view'),
+                                url(r'pai_test', MockApiView.as_view(), name='start with letters a, p, i'),
+                                )
+        urls = patterns('', url(base_path, include(url_patterns)))
+        urlparser = UrlParser()
+        apis = urlparser.get_apis(urls)
+        resources = urlparser.get_top_level_apis(apis)
+        self.assertEqual(set(resources), set([base_path + url_pattern.regex.pattern for url_pattern in url_patterns]))
+
     def test_flatten_url_tree_with_filter(self):
         urlparser = UrlParser()
         apis = urlparser.get_apis(self.url_patterns, filter_path="a-view")

rest_framework_swagger/tests.py

@@ -70,7 +70,9 @@ def __filter_top_level_apis__(self, root_paths):
         filtered_paths = set()
         base_path = self.__get_base_path__(root_paths)
         for path in root_paths:
-            resource = path.lstrip(base_path).split('/')[0]
+            if path.startswith(base_path):
+                path = path[len(base_path):]
+            resource = path.split('/')[0]
             filtered_paths.add(base_path + resource)
 
         return list(filtered_paths)