Yowzers. Final big bunch of refactoring for 0.1 release. Now support Django 1.3's views, admin style api is all polished off, loads of tests, new test project for running the test. All sorts of goodness. Getting ready to push this out now.

2 files changed, 10 insertions, 8 deletions

diff --git a/examples/objectstore/urls.py b/examples/objectstore/urls.py
index c04e731e..2c685f59 100644
--- a/examples/objectstore/urls.py
+++ b/examples/objectstore/urls.py
@@ -1,6 +1,7 @@
-from django.conf.urls.defaults import patterns
-
+from django.conf.urls.defaults import patterns, url
+from objectstore.views import ObjectStoreRoot, StoredObject
+ 
 urlpatterns = patterns('objectstore.views',
-    (r'^$', 'ObjectStoreRoot'), 
-    (r'^(?P<key>[A-Za-z0-9_-]{1,64})/$', 'StoredObject'),
+    url(r'^$', ObjectStoreRoot.as_view(), name='object-store-root'), 
+    url(r'^(?P<key>[A-Za-z0-9_-]{1,64})/$', StoredObject.as_view(), name='stored-object'),
 )
diff --git a/examples/objectstore/views.py b/examples/objectstore/views.py
index e1b239dc..b3ed5533 100644
--- a/examples/objectstore/views.py
+++ b/examples/objectstore/views.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.core.urlresolvers import reverse
 
 from djangorestframework.resource import Resource
 from djangorestframework.response import Response, status
@@ -29,7 +30,7 @@ class ObjectStoreRoot(Resource):
     def get(self, request, auth):
         """Return a list of all the stored object URLs."""
         keys = sorted(os.listdir(OBJECT_STORE_DIR))
-        return [self.reverse(StoredObject, key=key) for key in keys]
+        return [reverse('stored-object', kwargs={'key':key}) for key in keys]
     
     def post(self, request, auth, content):
         """Create a new stored object, with a unique key."""
@@ -37,9 +38,9 @@ class ObjectStoreRoot(Resource):
         pathname = os.path.join(OBJECT_STORE_DIR, key)
         pickle.dump(content, open(pathname, 'wb'))
         remove_oldest_files(OBJECT_STORE_DIR, MAX_FILES)
-        return Response(status.HTTP_201_CREATED, content, {'Location': self.reverse(StoredObject, key=key)})
- 
-        
+        return Response(status.HTTP_201_CREATED, content, {'Location': reverse('stored-object', kwargs={'key':key})})
+
+
 class StoredObject(Resource):
     """Represents a stored object.
     The object may be any picklable content."""