Working on private snipt api

snipt/snipts/api.py

@@ -1,3 +1,5 @@
+from tastypie.authentication import BasicAuthentication
+from tastypie.authorization import DjangoAuthorization
 from tastypie.resources import ModelResource
 from django.contrib.auth.models import User
 from snipts.models import Comment, Snipt
@@ -59,7 +61,8 @@ class PublicSniptResource(ModelResource):
     class Meta:
         queryset = Snipt.objects.filter(public=True).order_by('-created')
         resource_name = 'snipt'
-        fields = ['title', 'slug', 'lexer', 'code', 'created', 'modified',]
+        fields = ['title', 'description', 'slug', 'lexer', 'code', 'line_count',
+                  'created', 'modified',]
         include_absolute_url = True
         allowed_methods = ['get']
         filtering = { 'user': 'exact', }
@@ -84,62 +87,16 @@ class PublicSniptResource(ModelResource):
         return orm_filters
 
 
-class PrivateUserResource(ModelResource):
-    class Meta:
-        queryset = User.objects.all()
-        resource_name = 'user'
-        fields = ['username',]
-        include_absolute_url = True
-        allowed_methods = ['get']
-        list_allowed_methods = []
-        cache = SimpleCache()
-
-    def dehydrate(self, bundle):
-        bundle.data['snipts'] = '/api/public/snipt/?user=%d' % bundle.obj.id
-        return bundle
-
-class PrivateTagResource(ModelResource):
-    class Meta:
-        queryset = Tag.objects.filter(snipt__public=True)
-        queryset = queryset.annotate(count=Count('taggit_taggeditem_items__id'))
-        queryset = queryset.order_by('-count')
-        resource_name = 'tag'
-        fields = ['name',]
-        allowed_methods = ['get']
-        cache = SimpleCache()
-
-    def dehydrate(self, bundle):
-        bundle.data['absolute_url'] = '/public/tag/%s/' % bundle.obj.slug
-        bundle.data['snipts'] = '/api/public/snipt/?tag=%d' % bundle.obj.id
-        bundle.data['count'] = bundle.obj.taggit_taggeditem_items.filter(
-                               snipt__public=True).count()
-        return bundle
-
-class PrivateCommentResource(ModelResource):
-    user = fields.ForeignKey(PrivateUserResource, 'user')
-    snipt = fields.ForeignKey('snipts.api.PrivateSniptResource', 'snipt')
-
-    class Meta:
-        queryset = Comment.objects.filter(snipt__public=True).order_by('-created')
-        resource_name = 'comment'
-        fields = ['user', 'snipt', 'comment', 'created', 'modified',]
-        include_absolute_url = True
-        allowed_methods = ['get']
-        cache = SimpleCache()
-
 class PrivateSniptResource(ModelResource):
-    user = fields.ForeignKey(PrivateUserResource, 'user', full=True)
-    tags = fields.ToManyField(PrivateTagResource, 'tags', related_name='tag', full=True)
-    comments = fields.ToManyField(PrivateCommentResource, 'comment_set',
-                                  related_name='comment', full=True)
-
     class Meta:
-        queryset = Snipt.objects.filter(public=True).order_by('-created')
+        queryset = Snipt.objects.all().order_by('-created')
         resource_name = 'snipt'
-        fields = ['title', 'slug', 'lexer', 'code', 'created', 'modified',]
+        fields = ['title', 'description', 'slug', 'lexer', 'code', 'line_count',
+                  'key', 'public', 'created', 'modified',]
         include_absolute_url = True
-        allowed_methods = ['get']
-        filtering = { 'user': 'exact', }
+        allowed_methods = ['delete', 'get', 'post', 'put',]
+        authentication = BasicAuthentication()
+        authorization = DjangoAuthorization()
         cache = SimpleCache()
 
     def dehydrate(self, bundle):
@@ -147,16 +104,9 @@ class PrivateSniptResource(ModelResource):
         bundle.data['stylized'] = bundle.obj.get_stylized()
         return bundle
 
-    def build_filters(self, filters=None):
-        if filters is None:
-            filters = {}
-
-        orm_filters = super(PrivateSniptResource, self).build_filters(filters)
-
-        if 'tag' in filters:
-            tag = Tag.objects.get(pk=filters['tag'])
-            tagged_items = tag.taggit_taggeditem_items.all()
-            orm_filters['pk__in'] = [i.object_id for i in tagged_items]
-
-        return orm_filters
+    def obj_create(self, bundle, request=None, **kwargs):
+        return super(PrivateSniptResource, self).obj_create(bundle, request,
+                     user=request.user)
 
+    def apply_authorization_limits(self, request, object_list):
+        return object_list.filter(user=request.user)

snipt/urls.py

@@ -14,9 +14,6 @@ public_api.register(PublicCommentResource())
 public_api.register(PublicSniptResource())
 
 private_api = Api(api_name='private')
-private_api.register(PrivateUserResource())
-private_api.register(PrivateTagResource())
-private_api.register(PrivateCommentResource())
 private_api.register(PrivateSniptResource())
 
 urlpatterns = patterns('',