Merge pull request #317 from sartography/bugfix/non-bpmn-tutorial

Bugfix/non bpmn tutorial

Author: essweine

SpiffWorkflow/serializer/dict.py

@@ -50,7 +50,6 @@ def __init__(self, wf_spec, name, times, **kwargs):
             raise ValueError('times argument is required')
         TaskSpec.__init__(self, wf_spec, name, **kwargs)
         self.times = times
-        self.prevtaskclass = None
 
     def _find_my_task(self, task):
         for thetask in task.workflow.task_tree:

SpiffWorkflow/specs/MultiInstance.py

@@ -45,7 +45,8 @@ def _add_notify(self, task_spec):
         if task_spec.name in self.task_specs:
             raise KeyError('Duplicate task spec name: ' + task_spec.name)
         self.task_specs[task_spec.name] = task_spec
-        task_spec.id = self.name + '_' + str(len(self.task_specs))
+        # Why does this attribute even exist???
+        task_spec.id = str(len(self.task_specs))
 
     def get_task_spec_from_name(self, name):
         """
@@ -58,22 +59,6 @@ def get_task_spec_from_name(self, name):
         """
         return self.task_specs.get(name)
 
-    def get_task_spec_from_id(self, id):
-        """
-        Returns the task with the given name.
-
-        :type  name: str
-        :param name: The name of the task spec.
-        :rtype:  TaskSpec
-        :returns: The task spec with the given name.
-        """
-        ret_spec = None
-        for x in self.task_specs:
-            if self.task_specs[x].id == id:
-                ret_spec = self.task_specs[x]
-        return ret_spec
-
-
     def validate(self):
         """Checks integrity of workflow and reports any problems with it.
 

SpiffWorkflow/specs/WorkflowSpec.py

@@ -413,8 +413,8 @@ def serialize(self, serializer, **kwargs):
                   'class': class_name,
                   'name':self.name,
                   'description':self.description,
-                  'inputs':[x.id for x in self.inputs],
-                  'outputs':[x.id for x in self.outputs],
+                  'inputs':[x.name for x in self.inputs],
+                  'outputs':[x.name for x in self.outputs],
                   'manual':self.manual,
                   'internal':self.internal,
                   'data':self.data,

SpiffWorkflow/specs/base.py

@@ -1,18 +1,17 @@
-import json
-from SpiffWorkflow import Workflow
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.workflow import Workflow
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from serializer import NuclearSerializer
 
 # Load from JSON
 with open('nuclear.json') as fp:
     workflow_json = fp.read()
-serializer = NuclearSerializer()
-spec = WorkflowSpec.deserialize(serializer, workflow_json)
+nuclear_serializer = NuclearSerializer()
+spec = WorkflowSpec.deserialize(nuclear_serializer, workflow_json)
 
 # Create the workflow.
 workflow = Workflow(spec)
 
 # Execute until all tasks are done or require manual intervention.
 # For the sake of this tutorial, we ignore the "manual" flag on the
 # tasks. In practice, you probably don't want to do that.
-workflow.complete_all(halt_on_manual=False)
+workflow.run_all(halt_on_manual=False)

doc/non-bpmn/custom-tasks/start.py

@@ -1,4 +1,4 @@
-from SpiffWorkflow.specs import Simple
+from SpiffWorkflow.specs.Simple import Simple
 
 class NuclearStrike(Simple):
     def _on_complete_hook(self, my_task):

doc/non-bpmn/custom-tasks/strike.py

@@ -2,23 +2,23 @@
     "task_specs": {
         "Start": {
             "class": "SpiffWorkflow.specs.StartTask.StartTask",
-	    "id" : 1,
+	        "id" : 1,
             "manual": false,
             "outputs": [
-                2
+                "general"
             ]
         },
         "general": {
             "class": "SpiffWorkflow.specs.ExclusiveChoice.ExclusiveChoice",
             "name": "general",
-	    "id" : 2,
+	        "id" : 2,
             "manual": true,
             "inputs": [
-                1
+                "Start"
             ],
             "outputs": [
-                5,
-                3
+                "workflow_aborted",
+                "president"
             ],
             "choice": null,
             "default_task_spec": "workflow_aborted",
@@ -44,14 +44,14 @@
         "president": {
             "class": "SpiffWorkflow.specs.ExclusiveChoice.ExclusiveChoice",
             "name": "president",
-	    "id" : 3,
+	        "id" : 3,
             "manual": true,
             "inputs": [
-                2
+                "general"
             ],
             "outputs": [
-                5,
-                4
+                "workflow_aborted",
+                "nuclear_strike"
             ],
             "choice": null,
             "default_task_spec": "workflow_aborted",
@@ -75,20 +75,20 @@
             ]
         },
         "nuclear_strike": {
-	    "id" : 4,
+	        "id" : 4,
             "class": "SpiffWorkflow.specs.Simple.Simple",
             "name": "nuclear_strike",
             "inputs": [
-                3
+                "president"
             ]
         },
         "workflow_aborted": {
 	    "id" : 5,
             "class": "SpiffWorkflow.specs.Cancel.Cancel",
             "name": "workflow_aborted",
             "inputs": [
-                2,
-                3
+                "general",
+                "president"
             ]
         }
     },

doc/non-bpmn/tutorial/nuclear.json

@@ -1,4 +1,3 @@
-import json
 from SpiffWorkflow.workflow import Workflow
 from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.serializer.json import JSONSerializer

doc/non-bpmn/tutorial/start.py

@@ -3,6 +3,7 @@
 import sys
 import unittest
 import os
+
 dirname = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, os.path.join(dirname, '..', '..', '..'))
 doc_dir = os.path.join(dirname, '..', '..', '..', 'doc')