pull in -dev as 0.2.0

1 files changed, 23 insertions, 12 deletions

diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py
index 41d2e5c5..29651fbf 100644
--- a/examples/resourceexample/views.py
+++ b/examples/resourceexample/views.py
@@ -1,31 +1,42 @@
 from django.core.urlresolvers import reverse
 
-from djangorestframework.resource import Resource
+from djangorestframework.views import View
+from djangorestframework.resources import FormResource
 from djangorestframework.response import Response
 from djangorestframework import status
 
 from resourceexample.forms import MyForm
 
-class ExampleResource(Resource):
-    """A basic read-only resource that points to 3 other resources."""
-    allowed_methods = anon_allowed_methods = ('GET',)
+class MyFormValidation(FormResource):
+    """
+    A resource which applies form validation on the input.
+    """
+    form = MyForm
 
-    def get(self, request, auth):
+    
+class ExampleResource(View):
+    """
+    A basic read-only resource that points to 3 other resources.
+    """
+
+    def get(self, request):
         return {"Some other resources": [reverse('another-example-resource', kwargs={'num':num}) for num in range(3)]}
 
-class AnotherExampleResource(Resource):
-    """A basic GET-able/POST-able resource."""
-    allowed_methods = anon_allowed_methods = ('GET', 'POST')
-    form = MyForm # Optional form validation on input (Applies in this case the POST method, but can also apply to PUT)
 
-    def get(self, request, auth, num):
+class AnotherExampleResource(View):
+    """
+    A basic GET-able/POST-able resource.
+    """
+    resource = MyFormValidation
+
+    def get(self, request, num):
         """Handle GET requests"""
         if int(num) > 2:
             return Response(status.HTTP_404_NOT_FOUND)
         return "GET request to AnotherExampleResource %s" % num
     
-    def post(self, request, auth, content, num):
+    def post(self, request, num):
         """Handle POST requests"""
         if int(num) > 2:
             return Response(status.HTTP_404_NOT_FOUND)
-        return "POST request to AnotherExampleResource %s, with content: %s" % (num, repr(content))
+        return "POST request to AnotherExampleResource %s, with content: %s" % (num, repr(self.CONTENT))