lib/pallets/workflow.rb in pallets-0.3.0 vs lib/pallets/workflow.rb in pallets-0.4.0

@@ -2,45 +2,43 @@
   class Workflow
     extend DSL::Workflow
 
     attr_reader :context
 
-    def initialize(context = {})
+    def initialize(context_hash = {})
       @id = nil
-      @context = context
+      # Passed in context hash needs to be buffered
+      @context = Context.new.merge!(context_hash)
     end
 
     def run
       raise WorkflowError, "#{self.class.name} has no tasks. Workflows "\
                            "must contain at least one task" if self.class.graph.empty?
 
-      backend.run_workflow(id, jobs_with_order, context)
+      backend.run_workflow(id, jobs_with_order, serializer.dump_context(context.buffer))
       id
     end
 
     def id
-      @id ||= begin
-        initials = self.class.name.gsub(/[^A-Z]+([A-Z])/, '\1')[0,3]
-        random = SecureRandom.hex(5)
-        "P#{initials}#{random}".upcase
-      end
+      @id ||= "P#{Pallets::Util.generate_id(self.class.name)}".upcase
     end
 
     private
 
     def jobs_with_order
-      self.class.graph.sorted_with_order.map do |task_name, order|
-        job = serializer.dump(job_hash.merge(self.class.task_config[task_name]))
+      self.class.graph.sorted_with_order.map do |task_class, order|
+        job = serializer.dump(construct_job(task_class))
         [order, job]
       end
     end
 
-    def job_hash
-      {
-        'workflow_id'         => id,
-        'workflow_class_name' => self.class.name,
-        'created_at'          => Time.now.to_f
-      }
+    def construct_job(task_class)
+      {}.tap do |job|
+        job['wfid'] = id
+        job['jid'] = "J#{Pallets::Util.generate_id(task_class)}".upcase
+        job['workflow_class'] = self.class.name
+        job['created_at'] = Time.now.to_f
+      end.merge(self.class.task_config[task_class])
     end
 
     def backend
       Pallets.backend
     end