Merge activity post() logic into add()

Author: vshlapakov

scrapinghub/client.py

@@ -1040,15 +1040,16 @@ def __init__(self, *args, **kwargs):
         self._proxy_methods([('iter', 'list')])
         self._wrap_iter_methods(['iter'])
 
-    def add(self, *args, **kwargs):
-        entry = dict(*args, **kwargs)
-        return self.post(entry)
-
-    def post(self, _value, **kwargs):
-        jobkey = _value.get('job') or kwargs.get('job')
-        if jobkey and parse_job_key(jobkey).projectid != self.key:
-            raise ValueError('Please use same project id')
-        self._origin.post(_value, **kwargs)
+    def add(self, values, **kwargs):
+        if not isinstance(values, list):
+            values = list(values)
+        for activity in values:
+            if not isinstance(activity, dict):
+                raise ValueError("Please pass events as dictionaries")
+            jobkey = activity.get('job')
+            if jobkey and parse_job_key(jobkey).projectid != self.key:
+                raise ValueError('Please use same project id')
+        self._origin.post(values, **kwargs)
 
 
 class Collections(_Proxy):

tests/client/test_proxy.py

@@ -272,14 +272,15 @@ def test_items_list(spider):
 def _add_test_activity(project):
     activity = project.activity
     jobkey = TEST_PROJECT_ID + '/2/3'
-    activity.add(event='job:completed', job=jobkey, user='jobrunner')
-    activity.add(event='job:cancelled', job=jobkey, user='john')
+    events = [{'event': 'job:completed', 'job': jobkey, 'user': 'jobrunner'},
+              {'event': 'job:cancelled', 'job': jobkey, 'user': 'john'}]
+    activity.add(events)
 
 
 def test_activity_wrong_project(project):
+    event = {'event': 'job:completed', 'job': '123/1/1', 'user': 'user'}
     with pytest.raises(ValueError):
-        project.activity.add(event='job:completed',
-                             job='123/1/1', user='user')
+        project.activity.add(event)
 
 
 def test_activity_iter(project):