Minor enhancements

Author: yannbu

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+#0.2.3
+Minor enhancements (including the workflow find() method)
+
 #0.2.2
 New version scheme management
 

zenaton/__init__.py

@@ -1 +1 @@
-__version__ = '0.2.2'
+__version__ = '0.2.3'

zenaton/client.py

@@ -78,8 +78,8 @@ def send_event_url(self):
         :params .abstracts.workflow.Workflow flow
     """
     def start_workflow(self, flow):
-        self.http.post(self.instance_worker_url(),
-                       data=json.dumps({
+        return self.http.post(self.instance_worker_url(),
+                              data=json.dumps({
                            self.ATTR_PROG: self.PROG,
                            self.ATTR_CANONICAL: self.canonical_name(flow),
                            self.ATTR_NAME: self.class_name(flow),
@@ -95,7 +95,7 @@ def update_instance(self, workflow, custom_id, mode):
             self.ATTR_NAME: workflow.__name__,
             self.ATTR_MODE: mode
         })
-        self.http.put(url, options)
+        return self.http.put(url, options)
 
     """
         Sends an event to a workflow
@@ -112,7 +112,7 @@ def send_event(self, workflow_name, custom_id, event):
             self.EVENT_NAME: type(event).__name__,
             self.EVENT_INPUT: '{\"o\":\"@zenaton#0\",\"s\":[{\"a\":{}}]}',
         })
-        self.http.post(self.send_event_url(), body)
+        return self.http.post(self.send_event_url(), body)
 
     """
         Finds a workflow
@@ -149,7 +149,7 @@ def find_workflow(self, workflow, custom_id):
         :returns None
     """
     def kill_workflow(self, workflow_name, custom_id):
-        self.update_instance(workflow_name, custom_id, self.WORKFLOW_KILL)
+        return self.update_instance(workflow_name, custom_id, self.WORKFLOW_KILL)
 
     """
         Pauses a workflow
@@ -158,7 +158,7 @@ def kill_workflow(self, workflow_name, custom_id):
         :returns None
     """
     def pause_workflow(self, workflow_name, custom_id):
-        self.update_instance(workflow_name, custom_id, self.WORKFLOW_PAUSE)
+        return self.update_instance(workflow_name, custom_id, self.WORKFLOW_PAUSE)
 
     """
         Resumes a workflow
@@ -167,7 +167,7 @@ def pause_workflow(self, workflow_name, custom_id):
         :returns None
     """
     def resume_workflow(self, workflow_name, custom_id):
-        self.update_instance(workflow_name, custom_id, self.WORKFLOW_RUN)
+        return self.update_instance(workflow_name, custom_id, self.WORKFLOW_RUN)
 
     def instance_website_url(self, params=''):
         return self.website_url('instances', params)
@@ -182,12 +182,12 @@ def add_app_env(self, url, params):
 
     def parse_custom_id_from(self, flow):
         custom_id = flow.id()
-        if custom_id:
+        if custom_id is not None:
             if not isinstance(custom_id, str) and not isinstance(custom_id, int):
                 raise InvalidArgumentError('Provided ID must be a string or an integer')
             custom_id = str(custom_id)
             if len(custom_id) > self.MAX_ID_SIZE:
-                raise InvalidArgumentError('Provided Id must not exceed {} bytes'.format_map(self.MAX_ID_SIZE))
+                raise InvalidArgumentError('Provided Id must not exceed {} bytes'.format(self.MAX_ID_SIZE))
         return custom_id
 
     def canonical_name(self, flow):

zenaton/services/http_service.py

@@ -34,6 +34,7 @@ def request(self, method, url, headers, data=None):
             if r.status_code >= 400:
                 raise InternalError(r.content)
             content = r.json()
+            content['status_code'] = r.status_code
         except json.decoder.JSONDecodeError:
             raise InternalError
         except requests.exceptions.ConnectionError:

zenaton/tasks/wait.py

@@ -18,14 +18,14 @@ def __init__(self, event=None):
 
     @property
     def error(self):
-        return '{}: Invalid parameter - argument must be a Zenaton::Interfaces::Event subclass'.format(
+        return '{}: Invalid parameter - argument must be a zenaton.abstracts.event.Event subclass'.format(
             self.__class__.__name__)
 
     def handle(self):
         pass
 
     def valid_param(self, event):
-        return not hasattr(self, 'event') or isinstance(event, str) or self.event_class(event)
+        return not event or isinstance(event, str) or self.event_class(event)
 
     def event_class(self, event):
         return inspect.isclass(event) and issubclass(event, Event)