prepend _user_ to bucket when is the username

Author: javierdallamore

src/eventfabric.py

@@ -54,7 +54,8 @@ def send_event(self, event, requester=requests.post):
         headers = {'content-type': 'application/json'}
         if self.token:
             headers[self.session_header_name] = self.token
-        url = self.endpoint("streams") + "/" + (event.username or self.username) + "/" + event.channel + "/"
+        bucket = (event.bucket or ("_user_" + self.username))
+        url = self.endpoint("streams") + "/" + bucket + "/" + event.channel + "/"
         response = requester(url,
                 verify = False,
                 data=json.dumps(event.value),
@@ -68,20 +69,19 @@ class Event(object):
     
     value is a free form json value that contains the information from
     the event.
-    channel is a string with the name that identifies this kind of events
-    username is the logged in username"""
+    channel is a string with the name that identifies this kind of events """
 
-    def __init__(self, value, channel, username=None):
+    def __init__(self, value, channel, bucket=None):
         self.value = value
         self.channel = channel
-        self.username = username
+        self.bucket = bucket
 
     @property
     def json(self):
         """return a json representation of the object"""
         res = {"value": self.value, "channel": self.channel}
-        if self.username is not None:
-            res["username"] = self.username
+        if self.bucket is not None:
+            res["bucket"] = self.bucket
         return res
 
     def __str__(self):

tests/eventfabric_tests.py

@@ -34,8 +34,7 @@ class TestEventFabric(unittest.TestCase):
 
     def test_client_creation(self):
         "test that the client is created and parameters are set correctly"
-        client = ef.Client(USERNAME, PASSWORD,
-                "http://localhost:8080/")
+        client = ef.Client(USERNAME, PASSWORD, "http://localhost:8080/")
         self.assertEqual(client.username, USERNAME)
         self.assertEqual(client.password, PASSWORD)
         self.assertEqual(client.root_url, "http://localhost:8080/")
@@ -44,14 +43,12 @@ def test_client_creation(self):
 
     def test_endpoint(self):
         "tests that endpoints are created correctly"
-        client = ef.Client(USERNAME, PASSWORD,
-                "http://localhost:8080/")
+        client = ef.Client(USERNAME, PASSWORD, "http://localhost:8080/")
         self.assertEqual(client.endpoint("sessions"),
                 "http://localhost:8080/sessions")
 
     def test_login(self):
-        client = ef.Client(USERNAME, PASSWORD,
-                "http://localhost:8080/")
+        client = ef.Client(USERNAME, PASSWORD, "http://localhost:8080/")
         storage = []
         requester = fake_post(storage, FakeResponse(200))
         status, response = client.login(requester)
@@ -67,11 +64,10 @@ def test_login(self):
         self.assertEqual(endpoint, "http://localhost:8080/sessions")
 
     def test_send_event(self):
-        client = ef.Client(USERNAME, PASSWORD,
-                "http://localhost:8080/")
+        client = ef.Client(USERNAME, PASSWORD, "http://localhost:8080/")
         storage = []
         requester = fake_post(storage, FakeResponse(201))
-        data = {"name": "bob", "count": 10}
+        data = {"text": "bob", "percentage": 10}
         channel = "my.channel"
         event = ef.Event(data, channel)
         status, response = client.send_event(event, requester)
@@ -80,7 +76,7 @@ def test_send_event(self):
         data_arg = kwargs["data"]
         headers = kwargs["headers"]
 
-        self.assertTrue(status) 
+        self.assertTrue(status)
         self.assertEqual(response.status_code, 201)
         self.assertEqual(data_arg, json.dumps(event.json["value"]))
         self.assertEqual(headers["content-type"], "application/json")