Cleanup of the Reddit app, now uses Class views

app/reddit/views.py

@@ -1,62 +1,73 @@
-from django.contrib.auth.decorators import login_required
-from django.shortcuts import render_to_response, redirect
-from django.template import RequestContext
-from django.views.generic import TemplateView
-from django.http import HttpResponse
-import django.utils.simplejson as json
+from django.views.generic import TemplateView, DeleteView, CreateView
+from django.http import HttpResponse, HttpResponseRedirect
+from django.utils import simplejson as json
+from django.core.urlresolvers import reverse
 
 from django.contrib import messages
 from django.contrib.auth.models import User
+from django.contrib.auth.decorators import login_required
 from gargoyle.decorators import switch_is_active
 
 from reddit.forms import RedditAccountForm
 from reddit.models import RedditAccount
 
-@login_required
-@switch_is_active('reddit')
-def reddit_add(request):
-    """ Add a Reddit account to a user's account """
+class RedditAddAccount(CreateView):
+    """
+    Adds a reddit account to the system
+    """
 
-    if request.method == 'POST':
-        form = RedditAccountForm(request.POST)
-        if form.is_valid():
-            acc = RedditAccount()
-            acc.user = request.user
-            acc.username = form.cleaned_data['username']
-            try:
-                acc.api_update()
-            except RedditAccount.DoesNotExist:
-                messages.add_message(request, messages.ERROR, "Error, user %s does not exist on Reddit" % acc.username )
-                return render_to_response('reddit/add_reddit_account.html', locals(), context_instance=RequestContext(request))
-            acc.save()
+    model = RedditAccount
+    template_name = 'reddit/add.html'
+    form_class = RedditAccountForm
 
-            messages.add_message(request, messages.INFO, "Reddit account %s successfully added." % acc.username)
-            return redirect('sso.views.profile') # Redirect after POST
-    else:
-        defaults = { 'username': request.user.username, }
-        form = RedditAccountForm(defaults) # An unbound form
+    def get_success_url(self):
+        return reverse('sso.views.profile')
 
-    return render_to_response('reddit/add_reddit_account.html', locals(), context_instance=RequestContext(request))
+    def get_initial(self):
+        initial = super(RedditAddAccount, self).get_initial()
+        initial['username'] = self.request.user.username
+        initial['user'] = self.request.user
+        return initial
 
-@login_required
-@switch_is_active('reddit')
-def reddit_del(request, redditid=0):
-    """ Delete a Reddit account from a user's account """
-
-    if redditid > 0 :
+    def form_valid(self, form):
+        acc = form.save(commit=False)
+        acc.user = self.request.user
         try:
-            acc = RedditAccount.objects.get(id=redditid)
+            acc.api_update()
         except RedditAccount.DoesNotExist:
-            return redirect('sso.views.profile')
+            messages.add_message(self.request, messages.ERROR, "Error, user %s does not exist on Reddit" % acc.username )
+        else:
+            acc.save()
+            messages.add_message(self.request, messages.INFO, "Reddit account %s successfully added." % acc.username)
+        return HttpResponseRedirect(self.get_success_url())
 
-        if acc.user == request.user:
-            acc.delete()
-            messages.add_message(request, messages.INFO, "Reddit account successfully deleted.")
 
-    return redirect('sso.views.profile')
+class RedditDeleteAccount(DeleteView):
+    """
+    Deletes an existing Reddit account stored in the system
+    """
+
+    slug_field = 'id'
+    model = RedditAccount
+    template_name = 'reddit/delete.html'
+    context_object_name = 'account'
+
+    def get_success_url(self):
+        return reverse('sso.views.profile')
+
+    def delete(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        if self.object.user == self.request.user:
+            self.object.delete()
+            messages.add_message(self.request, messages.INFO, "Reddit account successfully deleted.")
+        return HttpResponseRedirect(self.get_success_url())
 
 
 class JSONResponseMixin(object):
+    """
+    Renders the template context as a JSON response
+    """
+
     def render_to_response(self, context):
         "Returns a JSON response containing 'context' as payload"
         return self.get_json_response(self.convert_context_to_json(context))
@@ -69,10 +80,6 @@ class JSONResponseMixin(object):
 
     def convert_context_to_json(self, context):
         "Convert the context dictionary into a JSON object"
-        # Note: This is *EXTREMELY* naive; in reality, you'll need
-        # to do much more complex handling to ensure that arbitrary
-        # objects -- such as Django model instances or querysets
-        # -- can be serialized as JSON.
         return json.dumps(context)