diff options
| -rw-r--r-- | AUTHORS | 6 | ||||
| -rw-r--r-- | docs/index.rst | 4 | ||||
| -rw-r--r-- | examples/blogpost/tests.py | 22 |
3 files changed, 18 insertions, 14 deletions
@@ -1,11 +1,13 @@ Tom Christie <tomchristie> - tom@tomchristie.com, @thisneonsoul Paul Bagwell <pbgwl> - Suggestions & bugfixes. -Marko Tibold <markotibold> - Contributions & Providing the Hudson CI Server. +Marko Tibold <markotibold> - Contributions & Providing the Jenkins CI Server. Sébastien Piquemal <sebpiq> - Contributions. Carmen Wick <cwick> - Bugfixes. Alex Ehlke <aehlke> - Design Contributions. +Alen Mujezinovic <flashingpumpkin> - Contributions. THANKS TO: + Jesper Noehr <jespern> & the django-piston contributors for providing the starting point for this project. -And of course, to the Django core team and the Django community at large. +And of course, to the Django core team and the Django community at large. You guys rock. diff --git a/docs/index.rst b/docs/index.rst index dfa361bd..481bdfe2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -83,8 +83,8 @@ Using Django REST framework can be as simple as adding a few lines to your urlco model = MyModel urlpatterns = patterns('', - url(r'^$', RootModelResource.as_view(resource=MyResource)), - url(r'^(?P<pk>[^/]+)/$', ModelResource.as_view(resource=MyResource)), + url(r'^$', ListOrCreateModelView.as_view(resource=MyResource)), + url(r'^(?P<pk>[^/]+)/$', InstanceModelView.as_view(resource=MyResource)), ) Django REST framework comes with two "getting started" examples. diff --git a/examples/blogpost/tests.py b/examples/blogpost/tests.py index 30b152fa..e55f0f90 100644 --- a/examples/blogpost/tests.py +++ b/examples/blogpost/tests.py @@ -7,9 +7,10 @@ from django.core.urlresolvers import reverse from django.utils import simplejson as json from djangorestframework.compat import RequestFactory +from djangorestframework.views import InstanceModelView, ListOrCreateModelView -from blogpost import models -import blogpost +from blogpost import models, urls +#import blogpost # class AcceptHeaderTests(TestCase): @@ -178,32 +179,33 @@ class TestRotation(TestCase): models.BlogPost.objects.all().delete() def test_get_to_root(self): - '''Simple test to demonstrate how the requestfactory needs to be used''' + '''Simple get to the *root* url of blogposts''' request = self.factory.get('/blog-post') - view = views.BlogPosts.as_view() + view = ListOrCreateModelView.as_view(resource=urls.BlogPostResource) response = view(request) self.assertEqual(response.status_code, 200) def test_blogposts_not_exceed_MAX_POSTS(self): '''Posting blog-posts should not result in more than MAX_POSTS items stored.''' - for post in range(views.MAX_POSTS + 5): + for post in range(models.MAX_POSTS + 5): form_data = {'title': 'This is post #%s' % post, 'content': 'This is the content of post #%s' % post} request = self.factory.post('/blog-post', data=form_data) - view = views.BlogPosts.as_view() + view = ListOrCreateModelView.as_view(resource=urls.BlogPostResource) view(request) - self.assertEquals(len(models.BlogPost.objects.all()),views.MAX_POSTS) + self.assertEquals(len(models.BlogPost.objects.all()),models.MAX_POSTS) def test_fifo_behaviour(self): '''It's fine that the Blogposts are capped off at MAX_POSTS. But we want to make sure we see FIFO behaviour.''' for post in range(15): form_data = {'title': '%s' % post, 'content': 'This is the content of post #%s' % post} request = self.factory.post('/blog-post', data=form_data) - view = views.BlogPosts.as_view() + view = ListOrCreateModelView.as_view(resource=urls.BlogPostResource) view(request) request = self.factory.get('/blog-post') - view = views.BlogPosts.as_view() + view = ListOrCreateModelView.as_view(resource=urls.BlogPostResource) response = view(request) response_posts = json.loads(response.content) response_titles = [d['title'] for d in response_posts] - self.assertEquals(response_titles, ['%s' % i for i in range(views.MAX_POSTS - 5, views.MAX_POSTS + 5)]) + response_titles.reverse() + self.assertEquals(response_titles, ['%s' % i for i in range(models.MAX_POSTS - 5, models.MAX_POSTS + 5)])
\ No newline at end of file |