Merge lp:~soren/surveilr/user into lp:surveilr

[Soren Hansen]

Add a basic user concept

[lp:~soren/surveilr/user]

10. By Soren Hansen on 2011-11-29

Fix typo (s/service/user)

=== modified file 'surveilr/api/server.py'
--- surveilr/api/server.py	2011-11-20 00:17:50 +0000
+++ surveilr/api/server.py	2011-11-29 20:10:29 +0000
@@ -39,6 +39,38 @@
 from surveilr import utils
 
 
+class UserController(object):
+    """Routes style controller for actions related to users"""
+
+    def create(self, req):
+        """Called for POST requests to /users
+
+        Creates the user, returns a JSON object with the ID assigned
+        to the user"""
+        data = json.loads(req.body)
+        user = models.User(**data)
+        user.save()
+        response = {'id': user.key}
+        return Response(json.dumps(response))
+
+    def show(self, req, id):
+        """Called for GET requests to /users/{id}
+
+        Returns information for the given service"""
+        try:
+            user = models.User.get(id)
+            return Response({'id': user.key})
+        except riakalchemy.NoSuchObjectError:
+            return HTTPNotFound()
+
+    def delete(self, req, id):
+        """Called for DELETE requests to /users/{id}
+
+        Delete the given user"""
+        models.User.get(id).delete()
+        return Response('')
+
+
 class ServiceController(object):
     """Routes style controller for actions related to services"""
 
@@ -105,6 +137,7 @@
     map.resource("metric", "metrics", controller='MetricController',
                  path_prefix='/services/{service_name}')
     map.resource("service", "services", controller='ServiceController')
+    map.resource("user", "users", controller='UserController')
 
     @wsgify
     def __call__(self, req):

=== modified file 'surveilr/models.py'
--- surveilr/models.py	2011-11-20 00:17:50 +0000
+++ surveilr/models.py	2011-11-29 20:10:29 +0000
@@ -37,6 +37,11 @@
     most_recent_log_entry = RelatedObjects()
 
 
+class User(RiakObject):
+    """A user of the service"""
+    bucket_name = 'users'
+
+
 class LogEntry(RiakObject):
     """A log entry holding one or more metrics
 

=== modified file 'surveilr/tests/test_api_server.py'
--- surveilr/tests/test_api_server.py	2011-11-20 00:17:50 +0000
+++ surveilr/tests/test_api_server.py	2011-11-29 20:10:29 +0000
@@ -34,6 +34,28 @@
         import riakalchemy
         riakalchemy.connect()
 
+    def test_create_retrieve_user(self):
+        """Create, retrieve, delete, attempt to retrieve again"""
+        req = Request.blank('/users',
+                            method='POST',
+                            POST=json.dumps({}))
+        resp = application(req)
+        self.assertEquals(resp.status_int, 200)
+
+        service_id = json.loads(resp.body)['id']
+
+        req = Request.blank('/users/%s' % service_id)
+        resp = application(req)
+        self.assertEquals(resp.status_int, 200)
+
+        req = Request.blank('/users/%s' % service_id, method='DELETE')
+        resp = application(req)
+        self.assertEquals(resp.status_int, 200)
+
+        req = Request.blank('/users/%s' % service_id)
+        resp = application(req)
+        self.assertEquals(resp.status_int, 404)
+
     def test_create_retrieve_service(self):
         """Create, retrieve, delete, attempt to retrieve again"""
         req = Request.blank('/services',