Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7c6e3cf

Browse files
committedSep 17, 2015
Don't lowercase resource names as it destroys inflection
1 parent b06eecb commit 7c6e3cf

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed
 

‎example/tests/test_utils.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import pytest
22

3+
from django.conf import settings
34
from django.contrib.auth import get_user_model
45
from rest_framework import serializers
56
from rest_framework.response import Response
@@ -8,7 +9,7 @@
89

910
pytestmark = pytest.mark.django_db
1011

11-
class Resource(APIView):
12+
class ResourceView(APIView):
1213
pass
1314

1415
class ResourceSerializer(serializers.ModelSerializer):
@@ -17,9 +18,15 @@ class Meta():
1718
model = get_user_model()
1819

1920
def test_get_resource_name():
20-
view = Resource()
21+
view = ResourceView()
2122
context = {'view': view}
22-
assert 'resources' == utils.get_resource_name(context), 'derived from view'
23+
setattr(settings, 'JSON_API_FORMAT_KEYS', None)
24+
assert 'ResourceViews' == utils.get_resource_name(context), 'not formatted'
25+
26+
view = ResourceView()
27+
context = {'view': view}
28+
setattr(settings, 'JSON_API_FORMAT_KEYS', 'dasherize')
29+
assert 'resource-views' == utils.get_resource_name(context), 'derived from view'
2330

2431
view.model = get_user_model()
2532
assert 'users' == utils.get_resource_name(context), 'derived from view model'
@@ -33,7 +40,7 @@ def test_get_resource_name():
3340
view.response = Response(status=500)
3441
assert 'errors' == utils.get_resource_name(context), 'handles 500 error'
3542

36-
view = Resource()
43+
view = ResourceView()
3744
context = {'view': view}
3845
view.serializer_class = ResourceSerializer
3946
assert 'users' == utils.get_resource_name(context), 'derived from serializer'

‎rest_framework_json_api/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ def get_resource_name(context):
7070
if not isinstance(resource_name, six.string_types):
7171
return resource_name
7272

73-
resource_name = inflection.pluralize(resource_name.lower())
74-
7573
resource_name = format_value(resource_name)
7674

75+
resource_name = inflection.pluralize(resource_name)
76+
7777
return resource_name
7878

7979

0 commit comments

Comments
 (0)
Please sign in to comment.