Skip to content

Commit 0d9a4cf

Browse files
committed
Updated names so renderer, parser, and pagination are the same format
1 parent 4575958 commit 0d9a4cf

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

README.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Rest Framework.
9494
Settings
9595
^^^^^^^^
9696

97-
One can either add ``rest_framework_ember.parsers.EmberJSONParser`` and
97+
One can either add ``rest_framework_ember.parsers.JSONParser`` and
9898
``rest_framework_ember.renderers.JSONRenderer`` to each ``ViewSet`` class, or
9999
override ``settings.REST_FRAMEWORK``::
100100

@@ -104,9 +104,9 @@ override ``settings.REST_FRAMEWORK``::
104104
'PAGINATE_BY_PARAM': 'page_size',
105105
'MAX_PAGINATE_BY': 100,
106106
'DEFAULT_PAGINATION_SERIALIZER_CLASS':
107-
'rest_framework_ember.pagination.EmberPaginationSerializer',
107+
'rest_framework_ember.pagination.PaginationSerializer',
108108
'DEFAULT_PARSER_CLASSES': (
109-
'rest_framework_ember.parsers.EmberJSONParser',
109+
'rest_framework_ember.parsers.JSONParser',
110110
'rest_framework.parsers.FormParser',
111111
'rest_framework.parsers.MultiPartParser'
112112
),

example/api/api.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ class UserEmber(User):
6262
resource_name = 'data'
6363

6464
renderer_classes = (renderers.JSONRenderer, )
65-
parser_classes = (parsers.EmberJSONParser, )
65+
parser_classes = (parsers.JSONParser, )
6666

6767

6868
class EmberUserModelViewSet(viewsets.ModelViewSet):
6969
queryset = auth_models.User.objects.all()
7070
serializer_class = IdentitySerializer
7171
allowed_methods = ['GET', 'POST', 'PUT', ]
7272
renderer_classes = (renderers.JSONRenderer, )
73-
parser_classes = (parsers.EmberJSONParser, )
73+
parser_classes = (parsers.JSONParser, )
7474

7575

7676
class MultipleIDMixinUserModelViewSet(mixins.MultipleIDMixin,

example/settings.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
'PAGINATE_BY_PARAM': 'page_size',
3939
'MAX_PAGINATE_BY': 100,
4040
'DEFAULT_PAGINATION_SERIALIZER_CLASS':
41-
'rest_framework_ember.pagination.EmberPaginationSerializer',
41+
'rest_framework_ember.pagination.PaginationSerializer',
4242
'DEFAULT_PARSER_CLASSES': (
43-
# 'rest_framework_ember.parsers.EmberJSONParser',
43+
# 'rest_framework_ember.parsers.JSONParser',
4444
'rest_framework.parsers.FormParser',
4545
'rest_framework.parsers.MultiPartParser'
4646
),
@@ -49,7 +49,6 @@
4949
'rest_framework.renderers.JSONRenderer',
5050
'rest_framework.renderers.BrowsableAPIRenderer',
5151
),
52-
'DATETIME_FORMAT': '%Y-%m-%d %H:%M:%S',
5352
}
5453

5554

rest_framework_ember/pagination.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def to_representation(self, value):
7070

7171

7272

73-
class EmberPaginationSerializer(pagination.BasePaginationSerializer):
73+
class PaginationSerializer(pagination.BasePaginationSerializer):
7474
next = NextPageField(source='*')
7575
next_link = NextPageLinkField(source='*')
7676
page = PageField(source='*')
@@ -79,3 +79,10 @@ class EmberPaginationSerializer(pagination.BasePaginationSerializer):
7979
count = serializers.ReadOnlyField(source='paginator.count')
8080
total = serializers.ReadOnlyField(source='paginator.num_pages')
8181

82+
83+
class EmberPaginationSerializer(PaginationSerializer):
84+
"""
85+
Backwards compatibility for name change
86+
"""
87+
pass
88+

rest_framework_ember/parsers.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""
22
Parsers
33
"""
4-
from rest_framework.parsers import JSONParser
4+
from rest_framework import parsers
55
from rest_framework_ember.utils import get_resource_name
66

77
from .utils import format_keys
88

99

10-
class EmberJSONParser(JSONParser):
10+
class JSONParser(parsers.JSONParser):
1111
"""
1212
By default, EmberJS sends a payload that looks like the following::
1313
@@ -26,7 +26,15 @@ def parse(self, stream, media_type=None, parser_context=None):
2626
"""
2727
Parses the incoming bytestream as JSON and returns the resulting data
2828
"""
29-
result = super(EmberJSONParser, self).parse(stream, media_type=None,
29+
result = super(JSONParser, self).parse(stream, media_type=None,
3030
parser_context=None)
3131
resource = result.get(get_resource_name(parser_context.get('view', None)))
3232
return format_keys(resource, 'underscore')
33+
34+
35+
class EmberJSONParser(JSONParser):
36+
"""
37+
Backward compatability for our first uniquely named parser
38+
"""
39+
pass
40+

0 commit comments

Comments
 (0)