Merge pull request #326 from agrare/dont_access_payload

Refactor workflow state check

Author: kbrock

lib/floe/validation_mixin.rb

@@ -22,10 +22,6 @@ def runtime_field_error!(field_name, field_value, comment, floe_error: "States.R
       raise Floe::ExecutionError.new(self.class.field_error_text(name, field_name, field_value, comment), floe_error)
     end
 
-    def workflow_state?(field_value, workflow)
-      workflow.payload["States"] ? workflow.payload["States"].include?(field_value) : true
-    end
-
     def wrap_parser_error(field_name, field_value)
       yield
     rescue ArgumentError, InvalidWorkflowError => error

lib/floe/workflow/catcher.rb

@@ -24,7 +24,7 @@ def initialize(workflow, name, payload)
 
       def validate_state_next!(workflow)
         missing_field_error!("Next") if @next.nil?
-        invalid_field_error!("Next", @next, "is not found in \"States\"") if @next && !workflow_state?(@next, workflow)
+        invalid_field_error!("Next", @next, "is not found in \"States\"") if @next && !workflow.state?(@next)
       end
     end
   end

lib/floe/workflow/choice_rule.rb

@@ -51,7 +51,7 @@ def validate_next!(workflow)
         elsif !@next
           # top level nodes require a next
           missing_field_error!("Next")
-        elsif !workflow_state?(@next, workflow)
+        elsif !workflow.state?(@next)
           # top level nodes require a next field that is found
           invalid_field_error!("Next", @next, "is not found in \"States\"")
         end

lib/floe/workflow/states/choice.rb

@@ -49,7 +49,7 @@ def validate_state_choices!
         end
 
         def validate_state_default!(workflow)
-          invalid_field_error!("Default", @default, "is not found in \"States\"") if @default && !workflow_state?(@default, workflow)
+          invalid_field_error!("Default", @default, "is not found in \"States\"") if @default && !workflow.state?(@default)
         end
       end
     end

lib/floe/workflow/states/non_terminal_mixin.rb

@@ -13,7 +13,7 @@ def finish(context)
 
         def validate_state_next!(workflow)
           missing_field_error!("Next") if @next.nil? && !@end
-          invalid_field_error!("Next", @next, "is not found in \"States\"") if @next && !workflow_state?(@next, workflow)
+          invalid_field_error!("Next", @next, "is not found in \"States\"") if @next && !workflow.state?(@next)
         end
       end
     end

lib/floe/workflow_base.rb

@@ -77,6 +77,10 @@ def output(context)
       context.output.to_json if end?(context)
     end
 
+    def state?(state_name)
+      @payload["States"].include?(state_name)
+    end
+
     private
 
     def step!(context)
@@ -102,7 +106,7 @@ def end_workflow!(context)
     def validate_workflow!
       missing_field_error!("States") if @states.empty?
       missing_field_error!("StartAt") if @start_at.nil?
-      invalid_field_error!("StartAt", @start_at, "is not found in \"States\"") unless workflow_state?(@start_at, self)
+      invalid_field_error!("StartAt", @start_at, "is not found in \"States\"") unless state?(@start_at)
     end
   end
 end