david / django-modelviews / changeset / 1485fb2f6599

Up to file-list generic/rest_views.py:

@@ -123,25 +123,41 @@ class ModelView(BaseDetailView):
         if format is None:
             format = 'html'
         # If we didn't get object_pk or slug, assume this is an add view.
         if object_pk is None and slug is None:
             obj = None
         else:
-            obj = self.get_object(request, object_pk, slug)
+        # Filter initial queryset given request arguments.
         subset = self.get_subset(request, object_pk, slug, **kwargs)
         # Dispatch
         if request_method == 'GET':
-            return self.read(request, obj, self.get_responder(format))
+            return self.read(request, subset, self.get_responder(format, subset),
                              is_list=object_pk is None and slug is None)
         elif request_method == 'POST':
-            return self.create(request, self.get_responder(format))
+            return self.create(request, self.get_responder(format, subset))
         elif request_method == 'PUT':
-            return self.update(request, obj, self.get_responder(format))
+            return self.update(request, subset[0], self.get_responder(format, subset))
         elif request_method == 'DELETE':
-            return self.delete(request, obj, self.get_responder(format))
+            return self.delete(request, subset[0], self.get_responder(format, subset))
         else:
             raise Http404
-    def get_responder(self, format):
+    def get_subset(self, request, object_pk=None, slug=None, **kwargs):
         """
         Returns the filtered queryset from arguments.
         """
         # Verify if lookup arguments exist
         if 'lookup_kwargs' in kwargs:
             lookup_kwargs = kwargs['lookup_kwargs']
             for k, v in lookup_kwargs.items():
                 lookup_kwargs[k] = v % kwargs
         else:
             lookup_kwargs = {}
         if object_pk:
             lookup_kwargs['pk'] = object_pk
         elif slug and self.slug_field:
             lookup_kwargs[self.slug_field] = slug
         return self.get_query_set(request).filter(**lookup_kwargs)
     def get_responder(self, format, subset):
         """
         Returns a ``Responder`` instance given the format.
         """
@@ -149,7 +165,7 @@ class ModelView(BaseDetailView):
             # get_query_set requires a request parameter, but doesn't
             # do anything with the parameter (presumably a subclass
             # might. Passing self is an arbitrary decision.
-            return self.responders['%sResponder' % format.title()](self.get_query_set(self))
+            return self.responders['%sResponder' % format.title()](subset)
         except KeyError:
             raise ImproperlyConfigured("%s responder doesn't exist." % '%sResponder' % format.title())
@@ -171,14 +187,14 @@ class ModelView(BaseDetailView):
         """
         return form.save()
-    def read(self, request, obj, responder):
+    def read(self, request, subset, responder, is_list):
         """
         Returns a rendered list or element whether ``obj`` exists, idempotent.
         """
-        if obj is None:
+        if is_list:
             return responder.list(request, self.paginate_by, self.allow_empty)
         else:
-            return responder.element(request, obj)
+            return responder.element(request, subset[0])
     def create(self, request, responder):
         """

Up to file-list tests/templates/test_modelview/comment_list.html:

 <ul>
 {% for object in object_list %}
 <li> {{ object.content }} </li>
 {% endfor %}
 </ul>

Up to file-list tests/test_modelview/models.py:

 from django.db import models
 from django.contrib.auth.models import User
 class Article(models.Model):
     name = models.CharField(max_length=50)
@@ -9,3 +10,7 @@ class Article(models.Model):
     def get_absolute_url(self):
         # TODO: find a better way to handle that
         return '/rw-articles/%s/' % self.slug
 class Comment(models.Model):
     content = models.CharField(max_length=50)
     user = models.ForeignKey(User)

Up to file-list tests/test_modelview/tests.py:

 from django.test import TestCase
-from models import Article
+from models import Article, Comment
 from django.utils import simplejson
 from django.contrib.auth.models import User
 from xml.dom.minidom import parseString
@@ -20,7 +20,10 @@ class ModelViewTest(TestCase):
         Article.objects.create(name="My Story",
                                slug="my-story",
                                body="My thrilling story!")
-        User.objects.create_user('david', 'foo@bar.com', 'baz')
+        david = User.objects.create_user('david', 'foo@example.com', 'baz')
         will = User.objects.create_user('will', 'bar@example.com', 'baz')
         Comment.objects.create(content="David comment", user=david)
         Comment.objects.create(content="Will comment", user=will)
     def test_restricting_exposed_methods(self):
         """
@@ -199,3 +202,15 @@ class ModelViewTest(TestCase):
             self.assertEqual(len(data), Article.objects.count())
         except ImportError:
             pass
     def test_nested_resource(self):
         david = User.objects.all()[0]
         david_comment = Comment.objects.all()[0]
         will_comment = Comment.objects.all()[1]
         response = self.client.get('/users/%s/comments/' % david.username)
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'test_modelview/comment_list.html')
         self.assertNotEqual(response.content.find(david_comment.content), -1)
         self.assertEqual(response.content.find(will_comment.content), -1)

Up to file-list tests/urls.py:

 from django.conf.urls.defaults import *
-from test_modelview.models import Article
+from test_modelview.models import Article, Comment
 from django_modelview.generic.rest_views import *
 responders = (HtmlResponder, JsonResponder, XmlResponder,
@@ -13,6 +13,9 @@ rw_articles = ModelView(Article.objects.
 auth_articles = ModelView(Article.objects.all(),
                           responders=(HtmlResponder,),
                           methods={'GET': django_authentication})
 comments = ModelView(Comment.objects.all(),
                      responders=(HtmlResponder,),
                      methods=('GET',))
 formats = '(?P<format>(html|json|xml|yaml|atom|rss))?/?'
 slug = '(?P<slug>[-\w]+)?/?'
@@ -22,4 +25,6 @@ urlpatterns = patterns('',
     ('^articles/%(slug)s%(formats)s$' % locals(), articles),
     ('^rw-articles/%(slug)s$' % locals(), rw_articles),
     ('^auth-articles/%(slug)s$' % locals(), auth_articles),
     ('^users/(?P<username>[-\w]+)/comments/%(slug)s$' % locals(), comments,
         {'lookup_kwargs': {'user__username__exact': '%(username)s'}}),
+)

commit 41:	1485fb2f6599
parent 40:	08ef53bf9dda
branch:	default