Merge pull request #33 from securenative/dev

Dev

Author: inbaltako

README.md

@@ -100,7 +100,7 @@ context = SecureNative.context_builder().\
 
 event_options = EventOptionsBuilder(EventTypes.LOG_IN).\
 with_user_id("1234").\
-        with_user_traits(UserTraits("Your Name", "[email protected]")).\
+        with_user_traits(UserTraits("Your Name", "[email protected]", "+1234567890")).\
         with_context(context).\
         with_properties({"prop1": "CUSTOM_PARAM_VALUE", "prop2": True, "prop3": 3}).\
         build()
@@ -123,7 +123,7 @@ def track(request):
 
     event_options = EventOptionsBuilder(EventTypes.LOG_IN).\
         with_user_id("1234").\
-        with_user_traits(UserTraits("Your Name", "[email protected]")).\
+        with_user_traits(UserTraits("Your Name", "[email protected]", "+1234567890")).\
         with_context(context).\
         with_properties({"prop1": "CUSTOM_PARAM_VALUE", "prop2": True, "prop3": 3}).\
         build()
@@ -148,7 +148,7 @@ def track(request):
 
     event_options = EventOptionsBuilder(EventTypes.LOG_IN).\
         with_user_id("1234").\
-        with_user_traits(UserTraits("Your Name", "[email protected]")).\
+        with_user_traits(UserTraits("Your Name", "[email protected]", "+1234567890")).\
         with_context(context).\
         with_properties({"prop1": "CUSTOM_PARAM_VALUE", "prop2": True, "prop3": 3}).\
         build()

VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

securenative/event_manager.py

@@ -3,7 +3,6 @@
 import time
 
 from securenative.config.securenative_options import SecureNativeOptions
-from securenative.exceptions.securenative_http_exception import SecureNativeHttpException
 from securenative.http.securenative_http_client import SecureNativeHttpClient
 from securenative.logger import Logger
 
@@ -91,6 +90,7 @@ def run(self):
                             item.retry = False
                         elif res.status_code != 200:
                             item.retry = True
+                        self.queue.remove(item)
 
                         Logger.debug("Event successfully sent; {}".format(item.body))
                     except Exception as e:
@@ -134,6 +134,7 @@ def serialize(obj):
             "userTraits": {
                 "name": obj.user_traits.name,
                 "email": obj.user_traits.email,
+                "phone": obj.user_traits.phone,
                 "createdAt": obj.user_traits.created_at,
             },
             "request": {

securenative/event_options_builder.py

@@ -17,8 +17,8 @@ def with_user_traits(self, user_traits):
         self.event_options.user_traits = user_traits
         return self
 
-    def with_user(self, name, email, created_at=None):
-        self.event_options.user_traits = UserTraits(name, email, created_at)
+    def with_user(self, name, email, phone=None, created_at=None):
+        self.event_options.user_traits = UserTraits(name, email, phone, created_at)
         return self
 
     def with_context(self, context):

securenative/models/user_traits.py

@@ -1,6 +1,7 @@
 class UserTraits(object):
 
-    def __init__(self, name=None, email=None, created_at=None):
+    def __init__(self, name=None, email=None, phone=None, created_at=None):
         self.name = name
         self.email = email
         self.created_at = created_at
+        self.phone = phone

tests/api_manager_test.py

@@ -27,7 +27,7 @@ def setUp(self):
 
         self.event_options = EventOptionsBuilder(EventTypes.LOG_IN). \
             with_user_id("USER_ID"). \
-            with_user_traits(UserTraits("USER_NAME", "USER_EMAIL")). \
+            with_user_traits(UserTraits("USER_NAME", "USER_EMAIL", "+12012673412")). \
             with_context(self.context). \
             with_properties({"prop1": "CUSTOM_PARAM_VALUE",
                              "prop2": True,

tests/event_manager_test.py

@@ -17,7 +17,7 @@ def __init__(self):
         self.timestamp = datetime.now().strftime("%Y-%d-%dT%H:%M:%S.%fZ")
         self.rid = "432532"
         self.user_id = "1"
-        self.user_traits = UserTraits("some user", "[email protected]")
+        self.user_traits = UserTraits("some user", "[email protected]", "+12012673412")
         self.request = RequestContext()
         self.properties = []