This fixes #211; also fixes issues with data_files

LICENSE has to be an array. This may prevented proper installation.

Author: aleneum

setup.py

@@ -29,7 +29,7 @@
     package_data={'transitions': ['data/*'],
                   'transitions.tests': ['data/*']
                   },
-    data_files=[('', 'LICENSE')],
+    data_files=[('', ['LICENSE'])],
     install_requires=['six'],
     tests_require=tests_require,
     license='MIT',

tests/test_core.py

@@ -744,11 +744,11 @@ def always_raises(event_data):
 
         transitions = [
             {'trigger': 'go', 'source': 'A', 'dest': 'B'},
-            {'trigger': 'planA', 'source': 'B', 'dest': 'C', 'conditions': always_fails},
-            {'trigger': 'planB', 'source': 'B', 'dest': 'C', 'conditions': always_raises}
+            {'trigger': 'planA', 'source': 'B', 'dest': 'A', 'conditions': always_fails},
+            {'trigger': 'planB', 'source': 'B', 'dest': 'A', 'conditions': always_raises}
         ]
-        m = Machine(states=['A', 'B'], transitions=transitions,
-                    finalize_event=finalize_mock, initial='A', send_event=True)
+        m = self.stuff.machine_cls(states=['A', 'B'], transitions=transitions,
+                                   finalize_event=finalize_mock, initial='A', send_event=True)
 
         m.go()
         self.assertEqual(finalize_mock.call_count, 1)
@@ -772,9 +772,9 @@ def always_raises(event):
         def finalize_callback(event):
             self.assertEqual(event.error, exception)
 
-        m = Machine(states=['A', 'B'], send_event=True, initial='A',
-                    before_state_change=always_raises,
-                    finalize_event=finalize_callback)
+        m = self.stuff.machine_cls(states=['A', 'B'], send_event=True, initial='A',
+                                   before_state_change=always_raises,
+                                   finalize_event=finalize_callback)
 
         with self.assertRaises(ZeroDivisionError):
             m.to_B()

transitions/extensions/nesting.py

@@ -124,23 +124,37 @@ def _change_state(self, event_data):
 class NestedEvent(Event):
 
     def _trigger(self, model, *args, **kwargs):
-        tmp = self.machine.get_state(model.state)
-        while tmp.parent and tmp.name not in self.transitions:
-            tmp = tmp.parent
-        if tmp.name not in self.transitions:
+        state = self.machine.get_state(model.state)
+        while state.parent and state.name not in self.transitions:
+            state = state.parent
+        if state.name not in self.transitions:
             msg = "%sCan't trigger event %s from state %s!" % (self.machine.id, self.name,
                                                                model.state)
             if self.machine.get_state(model.state).ignore_invalid_triggers:
                 logger.warning(msg)
             else:
                 raise MachineError(msg)
-        event = EventData(self.machine.get_state(model.state), self, self.machine,
-                          model, args=args, kwargs=kwargs)
-        for t in self.transitions[tmp.name]:
-            event.transition = t
-            if t.execute(event):
-                return True
-        return False
+        event_data = EventData(self.machine.get_state(model.state), self, self.machine,
+                               model, args=args, kwargs=kwargs)
+
+        for func in self.machine.prepare_event:
+            self.machine._callback(func, event_data)
+            logger.debug("Executed machine preparation callback '%s' before conditions." % func)
+
+        try:
+            for t in self.transitions[state.name]:
+                event_data.transition = t
+                if t.execute(event_data):
+                    event_data.result = True
+                    break
+        except Exception as e:
+            event_data.error = e
+            raise
+        finally:
+            for func in self.machine.finalize_event:
+                self.machine._callback(func, event_data)
+                logger.debug("Executed machine finalize callback '%s'." % func)
+        return event_data.result
 
 
 class HierarchicalMachine(Machine):