Massive merge

3 files changed, 13 insertions, 4 deletions

diff --git a/examples/modelresourceexample/models.py b/examples/modelresourceexample/models.py
index ff0179c8..11f3eae2 100644
--- a/examples/modelresourceexample/models.py
+++ b/examples/modelresourceexample/models.py
@@ -2,6 +2,7 @@ from django.db import models
 
 MAX_INSTANCES = 10
 
+
 class MyModel(models.Model):
     foo = models.BooleanField()
     bar = models.IntegerField(help_text='Must be an integer.')
@@ -15,5 +16,3 @@ class MyModel(models.Model):
         super(MyModel, self).save(*args, **kwargs)
         while MyModel.objects.all().count() > MAX_INSTANCES:
             MyModel.objects.all().order_by('-created')[0].delete()
-
-
diff --git a/examples/modelresourceexample/resources.py b/examples/modelresourceexample/resources.py
index 634ea6b3..b74b0572 100644
--- a/examples/modelresourceexample/resources.py
+++ b/examples/modelresourceexample/resources.py
@@ -1,7 +1,14 @@
 from djangorestframework.resources import ModelResource
+from djangorestframework.reverse import reverse
 from modelresourceexample.models import MyModel
 
+
 class MyModelResource(ModelResource):
     model = MyModel
     fields = ('foo', 'bar', 'baz', 'url')
     ordering = ('created',)
+
+    def url(self, instance):
+        return reverse('model-resource-instance',
+                       kwargs={'id': instance.id},
+                       request=self.request)
diff --git a/examples/modelresourceexample/urls.py b/examples/modelresourceexample/urls.py
index b6a16542..c5e1f874 100644
--- a/examples/modelresourceexample/urls.py
+++ b/examples/modelresourceexample/urls.py
@@ -2,7 +2,10 @@ from django.conf.urls.defaults import patterns, url
 from djangorestframework.views import ListOrCreateModelView, InstanceModelView
 from modelresourceexample.resources import MyModelResource
 
+my_model_list = ListOrCreateModelView.as_view(resource=MyModelResource)
+my_model_instance = InstanceModelView.as_view(resource=MyModelResource)
+
 urlpatterns = patterns('',
-    url(r'^$',          ListOrCreateModelView.as_view(resource=MyModelResource), name='model-resource-root'),
-    url(r'^(?P<pk>[0-9]+)/$', InstanceModelView.as_view(resource=MyModelResource)),
+    url(r'^$', my_model_list, name='model-resource-root'),
+    url(r'^(?P<id>[0-9]+)/$', my_model_instance, name='model-resource-instance'),
 )