dynflow 0.7.1 → 0.7.2

data/lib/dynflow/action.rb

@@ -100,9 +100,7 @@ module Dynflow
       @run_step_id       = Type! attributes.fetch(:run_step_id), Integer, NilClass
       @finalize_step_id  = Type! attributes.fetch(:finalize_step_id), Integer, NilClass
 
-      @execution_plan    = Type!(attributes.fetch(:execution_plan),
-                                 ExecutionPlan) if phase? Plan, Present
-      @trigger           = Type! attributes.fetch(:trigger), Action, NilClass if phase? Plan
+      @execution_plan    = Type!(attributes.fetch(:execution_plan), ExecutionPlan) if phase? Present
 
       getter =-> key, required do
         required ? attributes.fetch(key) : attributes.fetch(key, {})
@@ -142,6 +140,12 @@ module Dynflow
       end
     end
 
+    def set_plan_context(execution_plan, trigger)
+      phase! Plan
+      @execution_plan = Type! execution_plan, ExecutionPlan
+      @trigger        = Type! trigger, Action, NilClass
+    end
+
     def trigger
       phase! Plan
       @trigger

data/lib/dynflow/execution_plan.rb

@@ -143,7 +143,8 @@ module Dynflow
 
     def prepare(action_class)
       save
-      @root_plan_step = add_step(Steps::PlanStep, action_class, generate_action_id)
+      @root_plan_step = add_plan_step(action_class)
+      @root_plan_step.save
     end
 
     def plan(*args)
@@ -225,8 +226,10 @@ module Dynflow
       current_run_flow.add_and_resolve(@dependency_graph, new_flow) if current_run_flow
     end
 
-    def add_plan_step(action_class, planned_by)
-      add_step(Steps::PlanStep, action_class, generate_action_id, planned_by.plan_step_id)
+    def add_plan_step(action_class, planned_by = nil)
+      add_step(Steps::PlanStep, action_class, generate_action_id, planned_by && planned_by.plan_step_id).tap do |step|
+        step.initialize_action
+      end
     end
 
     def add_run_step(action)

data/lib/dynflow/execution_plan/steps/plan_step.rb

@@ -37,25 +37,17 @@ module Dynflow
 
       # @return [Action]
       def execute(execution_plan, trigger, *args)
+        unless @action
+          raise "The action was not initialized, you might forgot to call initialize_action method"
+        end
+        @action.set_plan_context(execution_plan, trigger)
         Type! execution_plan, ExecutionPlan
-        attributes = { execution_plan_id: execution_plan.id,
-                       id:                action_id,
-                       step:              self,
-                       plan_step_id:      self.id,
-                       run_step_id:       nil,
-                       finalize_step_id:  nil,
-                       phase:             phase,
-                       execution_plan:    execution_plan,
-                       trigger:           trigger }
-        action     = action_class.new(attributes, execution_plan.world)
-        persistence.save_action(execution_plan_id, action)
-
-        with_meta_calculation(action) do
-          action.execute(*args)
+        with_meta_calculation(@action) do
+          @action.execute(*args)
         end
 
-        persistence.save_action(execution_plan_id, action)
-        return action
+        persistence.save_action(execution_plan_id, @action)
+        return @action
       end
 
       def self.state_transitions
@@ -83,6 +75,19 @@ module Dynflow
             hash[:real_time],
             hash[:children]
       end
+
+      def initialize_action
+        attributes = { execution_plan_id: execution_plan_id,
+                       id:                action_id,
+                       step:              self,
+                       plan_step_id:      self.id,
+                       run_step_id:       nil,
+                       finalize_step_id:  nil,
+                       phase:             phase}
+        @action = action_class.new(attributes, world)
+        persistence.save_action(execution_plan_id, @action)
+        @action
+      end
     end
   end
 end

data/lib/dynflow/testing/factories.rb

@@ -9,15 +9,15 @@ module Dynflow
         step           = DummyStep.new
         action_class.new(
             { step:              DummyStep.new,
-              execution_plan:    execution_plan,
-              trigger:           trigger,
               execution_plan_id: execution_plan.id,
               id:                Testing.get_id,
               phase:             Action::Plan,
               plan_step_id:      step.id,
               run_step_id:       nil,
               finalize_step_id:  nil },
-            execution_plan.world)
+            execution_plan.world).tap do |action|
+          action.set_plan_context(execution_plan, trigger)
+        end
       end
 
       def create_action_presentation(action_class)

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport