Merge branch 'release/0.1.34'

Author: ggreg

README.rst

@@ -1,3 +1,5 @@
+.. image:: https://travis-ci.org/botify-labs/python-simple-workflow.png?branch=develop   :target: https://travis-ci.org/botify-labs/python-simple-workflow
+
 ======================
 Python Simple Workflow
 ======================
@@ -27,4 +29,4 @@ Installation
 Usage and all the rest
 ======================
 
-Please, refer to `Documentation <http://python-simple-workflow.readthedocs.org>`_
+Please, refer to `Documentation <http://python-simple-workflow.readthedocs.org>`_

swf/__init__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-version = (0, 1, 33)
+version = (0, 1, 34)
 
 __title__ = "python-simple-workflow"
 __author__ = "Oleiade"

swf/actors/decider.py

@@ -1,8 +1,10 @@
 #! -*- coding: utf-8 -*-
 
+import boto.exception
+
 from swf.models.history import History
 from swf.actors.core import Actor
-from swf.exceptions import PollTimeout
+from swf.exceptions import PollTimeout, ResponseError, DoesNotExistError
 
 
 class Decider(Actor):
@@ -41,7 +43,7 @@ def complete(self, task_token,
                 decisions,
                 execution_context,
             )
-        except SWFResponseError as e:
+        except boto.exception.SWFResponseError as e:
             if e.error_code == 'UnknownResourceFault':
                 raise DoesNotExistError(
                     "Unable to complete decision task with token: {}.\n".format(task_token),
@@ -50,7 +52,6 @@ def complete(self, task_token,
 
             raise ResponseError(e.body['message'])
 
-
     def poll(self, task_list=None,
              identity=None,
              **kwargs):
@@ -94,7 +95,7 @@ def poll(self, task_list=None,
                     next_page_token=next_page,
                     **kwargs
                 )
-            except SWFResponseError as e:
+            except boto.exception.SWFResponseError as e:
                 if e.error_code == 'UnknownResourceFault':
                     raise DoesNotExistError(
                         "Unable to poll decision task.\n",

swf/models/decision/base.py

@@ -7,7 +7,7 @@
 
 from functools import wraps
 
-from swf.utils import decapitalize
+from swf.utils import decapitalize, underscore_to_camel
 
 
 def decision_action(fn):
@@ -46,8 +46,9 @@ def __init__(self, action=None, *args, **kwargs):
                 action_method(*args, **kwargs)
 
     def _fill_from_action(self, action):
-        self.type = action.capitalize() + self._base_type
-        self.attributes_key = decapitalize(self.type + self._attributes_key_suffix)
+        self.type = underscore_to_camel(action) + self._base_type
+        self.attributes_key = decapitalize(self.type +
+                                           self._attributes_key_suffix)
 
         self['decisionType'] = self.type
         self[self.attributes_key] = {}

swf/utils.py

@@ -7,6 +7,7 @@
 
 from datetime import datetime, timedelta
 from time import mktime
+from itertools import chain, izip, islice
 
 from functools import wraps
 
@@ -181,3 +182,32 @@ def camel_to_underscore(string):
             res.extend([char.lower()])
 
     return ''.join(res)
+
+
+def underscore_to_camel(string):
+    """
+
+    >>> underscore_to_camel('')
+    ''
+    >>> underscore_to_camel('a')
+    'A'
+    >>> underscore_to_camel('A')
+    'A'
+    >>> underscore_to_camel('ab')
+    'Ab'
+    >>> underscore_to_camel('a_b_c')
+    'ABC'
+    >>> underscore_to_camel('ab_cd_ef')
+    'AbCdEf'
+    >>> underscore_to_camel('request_cancel_workflow')
+    'RequestCancelWorkflow'
+
+    """
+    if string == '':
+        return ''
+
+    return ''.join(chain([string[0].upper()],
+                         ((c.upper() if p == '_' else c) if
+                          c != '_' else '' for p, c in
+                          izip(islice(string, 0, None),
+                               islice(string, 1, None)))))