Merge pull request #41 from mozilla-services/refactor-crud-decorator

Update kinto to use the new crud decorator

kinto/views/collection.py

@@ -6,15 +6,17 @@ class Options():
         preserve_unknown = True
 
 
-@resource.crud(path="/collections/{collection_id}/records/{id}",
-               collection_path="/collections/{collection_id}/records")
+@resource.register(
+    record_path="/collections/{{collection_id}}/records/{{id}}",
+    collection_path="/collections/{{collection_id}}/records",
+    name="collection")
 class Collection(resource.BaseResource):
 
     mapping = RecordSchema()
 
-    @property
-    def name(self):
-        return self.request.matchdict['collection_id']
+    def __init__(self, *args, **kwargs):
+        super(Collection, self).__init__(*args, **kwargs)
+        self.collection.collection_id = self.request.matchdict['collection_id']
 
     def is_known_field(self, field_name):
         """Without schema, any field is considered as known."""

setup.py

@@ -15,14 +15,18 @@
     'cornice',
     'six',
     'waitress',
-    'cliquet[postgresql,monitoring] < 2.0'
+    'cliquet[postgresql,monitoring]'  # > 2.0 once released.
 ]
 
 ENTRY_POINTS = {
     'paste.app_factory': [
         'main = kinto:main',
     ]}
 
+DEPENDENCY_LINKS = [
+    # Pre-release of Cliquet.
+    'https://github.com/mozilla-services/cliquet/tarball/#egg=Cliquet-2.0dev0',
+]
 
 setup(name='kinto',
       version='1.0.0.dev0',
@@ -43,4 +47,5 @@
       include_package_data=True,
       zip_safe=False,
       install_requires=REQUIREMENTS,
-      entry_points=ENTRY_POINTS)
+      entry_points=ENTRY_POINTS,
+      dependency_links=DEPENDENCY_LINKS)