Added custom context vendor configuration option (snowplow#67)

Author: fblundun

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
   - "2.7"
+  - "3.2"
   - "3.3"
 # command to install dependencies
 install:

CHANGES.txt

@@ -1,5 +1,6 @@
 Version 0.3.0 (2014-xx-xx)
 --------------------------
+Added custom context vendor configuration option (#67)
 Changed the return value of the tracking methods to a tuple (#65)
 Added coveralls code coverage button (#64)
 Added currency parameter to ecommerce tracking methods (#62)

snowplow_tracker/payload.py

@@ -145,7 +145,7 @@ def add_json(self, dict_, encode_base64, type_when_encoded, type_when_not_encode
             :type   type_when_not_encoded:  str
         """
 
-        if type(dict_) == "dict" and dict_ != {}:
+        if dict_ is not None and dict_ != {}:
 
             json_dict = json.dumps(dict_)
 

snowplow_tracker/test/integration/test_integration.py

@@ -153,16 +153,18 @@ def test_integration_unstruct_event_base64_error(self):
             self.assertEquals("walrus$tms in dict is not a tms", str(e))
 
     def test_integration_standard_nv_pairs(self):
-        t = tracker.Tracker("localhost", "cf", app_id="angry-birds-android")
+        t = tracker.Tracker("localhost", "cf", app_id="angry-birds-android", context_vendor="com.example")
         t.set_platform("mob")
         t.set_user_id("user12345")
         t.set_screen_resolution(100, 200)
         t.set_color_depth(24)
         t.set_timezone("Europe London")
         t.set_lang("en")
         with HTTMock(pass_response_content):
-            t.track_page_view("localhost", "local host", None)
-            expected_fields = {"tna": "cf", "evn": "com.snowplowanalytics", "res": "100x200", "lang": "en", "aid": "angry-birds-android", "cd": "24", "tz": "Europe+London", "p": "mob", "tv": "py-" + _version.__version__}
+            t.track_page_view("localhost", "local host", None, {'user': {'user_type': 'tester'}})
+            expected_fields = {"tna": "cf", "evn": "com.snowplowanalytics", "res": "100x200",
+                               "lang": "en", "aid": "angry-birds-android", "cd": "24", "tz": "Europe+London",
+                               "p": "mob", "tv": "py-" + _version.__version__, "cv": "com.example"}
             for key in expected_fields:
                 self.assertEquals(from_querystring(key, querystrings[-1]), expected_fields[key])
 

snowplow_tracker/test/unit/test_tracker.py

@@ -30,10 +30,11 @@ def setUp(self):
         pass
 
     def test_initialisation(self):
-        t = Tracker("d3rkrsqld9gmqf.cloudfront.net", "cloudfront", encode_base64= False, app_id="AF003")
+        t = Tracker("d3rkrsqld9gmqf.cloudfront.net", "cloudfront", encode_base64= False, app_id="AF003", context_vendor="com.example")
         self.assertEquals(t.standard_nv_pairs["tna"], "cloudfront")
         self.assertEquals(t.standard_nv_pairs["aid"], "AF003")
         self.assertEquals(t.config["encode_base64"], False)
+        self.assertEquals(t.config["context_vendor"], "com.example")
 
     """
     Testing URI generator

snowplow_tracker/tracker.py

@@ -51,7 +51,7 @@ class Tracker:
     new_contract("payload", lambda s: isinstance(s, payload.Payload))
 
     def __init__(self, collector_uri, 
-                 namespace=None, app_id=None, encode_base64=DEFAULT_ENCODE_BASE64, contracts=True):
+                 namespace=None, app_id=None, context_vendor=None, encode_base64=DEFAULT_ENCODE_BASE64, contracts=True):
         """
         Constructor
         """
@@ -61,7 +61,8 @@ def __init__(self, collector_uri,
         self.collector_uri = self.as_collector_uri(collector_uri)
 
         self.config = {
-            "encode_base64":    encode_base64
+            "encode_base64":    encode_base64,
+            "context_vendor": context_vendor
         }
 
         self.standard_nv_pairs = {
@@ -195,6 +196,8 @@ def track(self, pb):
             :rtype:                  tuple(bool, int | str)
         """
         pb.add_dict(self.standard_nv_pairs)
+        if "co" in pb.context or "cx" in pb.context:
+            pb.add("cv", self.config["context_vendor"])
         return self.http_get(pb)
 
     @contract