Merge pull request #16 from carltongibson/update

Update for DRF 3.0

Author: lovelydinosaur

manage.py

@@ -1,5 +1,5 @@
-djangorestframework==2.4.4
-django==1.5.1
+djangorestframework
+django==1.7.1
 Pygments==1.5
 Markdown==2.2.0
 

requirements.txt

@@ -4,17 +4,16 @@
 
 
 class SnippetSerializer(serializers.HyperlinkedModelSerializer):
-    owner = serializers.Field(source='owner.username')
+    owner = serializers.ReadOnlyField(source='owner.username')
     highlight = serializers.HyperlinkedIdentityField(view_name='snippet-highlight', format='html')
 
     class Meta:
         model = Snippet
         fields = ('url', 'highlight', 'owner',
                   'title', 'code', 'linenos', 'language', 'style')
-
-
+                  
 class UserSerializer(serializers.HyperlinkedModelSerializer):
-    snippets = serializers.HyperlinkedRelatedField(view_name='snippet-detail', many=True)
+    snippets = serializers.HyperlinkedRelatedField(queryset=Snippet.objects.all(), view_name='snippet-detail', many=True)
 
     class Meta:
         model = User

snippets/serializers.py

@@ -2,7 +2,7 @@
 from rest_framework import permissions
 from rest_framework import renderers
 from rest_framework import viewsets
-from rest_framework.decorators import link
+from rest_framework.decorators import detail_route
 from rest_framework.response import Response
 from snippets.models import Snippet
 from snippets.permissions import IsOwnerOrReadOnly
@@ -27,15 +27,14 @@ class SnippetViewSet(viewsets.ModelViewSet):
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,
                           IsOwnerOrReadOnly,)
 
-    @link(renderer_classes=(renderers.StaticHTMLRenderer,))
+    @detail_route(renderer_classes=(renderers.StaticHTMLRenderer,))
     def highlight(self, request, *args, **kwargs):
         snippet = self.get_object()
         return Response(snippet.highlighted)
 
-    def pre_save(self, obj):
-        obj.owner = self.request.user
-
-
+    def perform_create(self, serializer):
+        serializer.save(owner=self.request.user)
+    
 class UserViewSet(viewsets.ReadOnlyModelViewSet):
     """
     This endpoint presents the users in the system.