Allow related models to be fully serialized

4 files changed, 9 insertions, 47 deletions

diff --git a/examples/blogpost/models.py b/examples/blogpost/models.py
index c4925a15..d77f530d 100644
--- a/examples/blogpost/models.py
+++ b/examples/blogpost/models.py
@@ -22,6 +22,9 @@ class BlogPost(models.Model):
     slug = models.SlugField(editable=False, default='')
 
     def save(self, *args, **kwargs):
+        """
+        For the purposes of the sandbox, limit the maximum number of stored models.
+        """
         self.slug = slugify(self.title)
         super(self.__class__, self).save(*args, **kwargs)
         for obj in self.__class__.objects.order_by('-created')[MAX_POSTS:]:
diff --git a/examples/blogpost/urls.py b/examples/blogpost/urls.py
index 6fde612e..e9bd2754 100644
--- a/examples/blogpost/urls.py
+++ b/examples/blogpost/urls.py
@@ -1,38 +1,11 @@
 from django.conf.urls.defaults import patterns, url
-from django.core.urlresolvers import reverse
-
 from djangorestframework.views import ListOrCreateModelView, InstanceModelView
-from djangorestframework.resources import ModelResource
-
-from blogpost.models import BlogPost, Comment
-
-
-class BlogPostResource(ModelResource):
-    """
-    A Blog Post has a *title* and *content*, and can be associated with zero or more comments.
-    """
-    class Meta:
-        model = BlogPost
-        fields = ('created', 'title', 'slug', 'content', 'url', 'comments')
-        ordering = ('-created',)
-
-    def comments(self, instance):
-        return reverse('comments', kwargs={'blogpost': instance.key}) 
-
-
-class CommentResource(ModelResource):
-    """
-    A Comment is associated with a given Blog Post and has a *username* and *comment*, and optionally a *rating*. 
-    """
-    class Meta:
-        model = Comment
-        fields = ('username', 'comment', 'created', 'rating', 'url', 'blogpost')
-        ordering = ('-created',)
+from blogpost.resources import BlogPostResource, CommentResource
 
 
 urlpatterns = patterns('',
     url(r'^$', ListOrCreateModelView.as_view(resource=BlogPostResource), name='blog-posts-root'),
-    url(r'^(?P<key>[^/]+)/$', InstanceModelView.as_view(resource=BlogPostResource)),
+    url(r'^(?P<key>[^/]+)/$', InstanceModelView.as_view(resource=BlogPostResource), name='blog-post'),
     url(r'^(?P<blogpost>[^/]+)/comments/$', ListOrCreateModelView.as_view(resource=CommentResource), name='comments'),
     url(r'^(?P<blogpost>[^/]+)/comments/(?P<id>[^/]+)/$', InstanceModelView.as_view(resource=CommentResource)),
 )
diff --git a/examples/modelresourceexample/urls.py b/examples/modelresourceexample/urls.py
index 86960367..b6a16542 100644
--- a/examples/modelresourceexample/urls.py
+++ b/examples/modelresourceexample/urls.py
@@ -1,15 +1,8 @@
 from django.conf.urls.defaults import patterns, url
 from djangorestframework.views import ListOrCreateModelView, InstanceModelView
-from djangorestframework.resources import ModelResource
-from modelresourceexample.models import MyModel
-
-class MyModelResource(ModelResource):
-    class Meta:
-        model = MyModel
-        fields = ('foo', 'bar', 'baz', 'url')
-        ordering = ('created',)
+from modelresourceexample.resources import MyModelResource
 
 urlpatterns = patterns('',
     url(r'^$',          ListOrCreateModelView.as_view(resource=MyModelResource), name='model-resource-root'),
-    url(r'^([0-9]+)/$', InstanceModelView.as_view(resource=MyModelResource)),
+    url(r'^(?P<pk>[0-9]+)/$', InstanceModelView.as_view(resource=MyModelResource)),
 )
diff --git a/examples/pygments_api/views.py b/examples/pygments_api/views.py
index 76647107..e50029f6 100644
--- a/examples/pygments_api/views.py
+++ b/examples/pygments_api/views.py
@@ -46,19 +46,12 @@ class HTMLRenderer(BaseRenderer):
     media_type = 'text/html'
 
 
-
-class PygmentsFormResource(FormResource):
-    """
-    """
-    form = PygmentsForm
-
-
 class PygmentsRoot(View):
     """
-    This example demonstrates a simple RESTful Web API aound the awesome pygments library.
+    This example demonstrates a simple RESTful Web API around the awesome pygments library.
     This top level resource is used to create highlighted code snippets, and to list all the existing code snippets.
     """
-    resource = PygmentsFormResource
+    form = PygmentsForm
 
     def get(self, request):
         """