Fixed compatibility with DRF 3.0.0

Closes #16

Author: jerel

example/api/api.py

@@ -66,7 +66,7 @@ class UserEmber(User):
 
 
 class EmberUserModelViewSet(viewsets.ModelViewSet):
-    model = auth_models.User
+    queryset = auth_models.User.objects.all()
     serializer_class = IdentitySerializer
     allowed_methods = ['GET', 'POST', 'PUT', ]
     renderer_classes = (renderers.JSONRenderer, )

example/tests/test_format_keys.py

@@ -46,7 +46,7 @@ def test_camelization(self):
 
         json_content = json.loads(response.content)
         meta = json_content.get('meta')
-       
+
         self.assertEquals(expected.get('user'), json_content.get('user'))
         self.assertEqual('http://testserver/user-viewset/?page=2', meta.get('nextLink'))
 

rest_framework_ember/pagination.py

@@ -5,13 +5,13 @@
 from rest_framework_ember.utils import get_resource_name
 
 
-class NextPageLinkField(serializers.Field):
+class NextPageLinkField(serializers.ReadOnlyField):
     """
     Field that returns a link to the next page in paginated results.
     """
     page_field = 'page'
 
-    def to_native(self, value):
+    def to_representation(self, value):
         if not value.has_next():
             return None
         page = value.next_page_number()
@@ -20,25 +20,25 @@ def to_native(self, value):
         return replace_query_param(url, self.page_field, page)
 
 
-class NextPageField(serializers.Field):
+class NextPageField(serializers.ReadOnlyField):
     """
     Field that returns a link to the next page in paginated results.
     """
     page_field = 'page'
 
-    def to_native(self, value):
+    def to_representation(self, value):
         if not value.has_next():
             return None
         return value.next_page_number()
 
 
-class PreviousPageLinkField(serializers.Field):
+class PreviousPageLinkField(serializers.ReadOnlyField):
     """
     Field that returns a link to the previous page in paginated results.
     """
     page_field = 'page'
 
-    def to_native(self, value):
+    def to_representation(self, value):
         if not value.has_previous():
             return None
         page = value.previous_page_number()
@@ -47,25 +47,25 @@ def to_native(self, value):
         return replace_query_param(url, self.page_field, page)
 
 
-class PreviousPageField(serializers.Field):
+class PreviousPageField(serializers.ReadOnlyField):
     """
     Field that returns a link to the previous page in paginated results.
     """
     page_field = 'page'
 
-    def to_native(self, value):
+    def to_representation(self, value):
         if not value.has_previous():
             return None
         return value.previous_page_number()
 
 
-class PageField(serializers.Field):
+class PageField(serializers.ReadOnlyField):
     """
     Field that returns a link to the previous page in paginated results.
     """
     page_field = 'page'
 
-    def to_native(self, value):
+    def to_representation(self, value):
         return value.number
 
 
@@ -76,5 +76,6 @@ class EmberPaginationSerializer(pagination.BasePaginationSerializer):
     page = PageField(source='*')
     previous = PreviousPageField(source='*')
     previous_link = PreviousPageLinkField(source='*')
-    count = serializers.Field(source='paginator.count')
+    count = serializers.ReadOnlyField(source='paginator.count')
+    total = serializers.ReadOnlyField(source='paginator.num_pages')
 

rest_framework_ember/renderers.py

@@ -1,4 +1,3 @@
-import copy
 import inflection
 
 from django.conf import settings
@@ -29,20 +28,20 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
             return super(JSONRenderer, self).render(
                 data, accepted_media_type, renderer_context)
 
-        data = format_keys(data, 'camelize') 
+        data = format_keys(data, 'camelize')
 
         try:
-            data_copy = copy.copy(data)
-            content = data_copy.pop('results')
+            content = data.pop('results')
             resource_name = format_resource_name(content, resource_name)
-            data = {resource_name : content, "meta" : data_copy}
+            data = {resource_name : content, "meta" : data}
         except (TypeError, KeyError, AttributeError) as e:
-            
+
             # Default behavior
             if not resource_name == 'data':
                 format_keys(data, 'camelize')
                 resource_name = format_resource_name(data, resource_name)
 
             data = {resource_name : data}
+
         return super(JSONRenderer, self).render(
             data, accepted_media_type, renderer_context)