WIP: think we want to move away from parsing at all inside workflow

also, team not thrilled with having the wrap stuff everywhere. so need to come back

Author: kbrock

lib/floe/workflow.rb

@@ -79,10 +79,14 @@ def wait(workflows, timeout: nil, &block)
 
     attr_reader :comment, :context
 
+    # @param [Json String|Hash|Array] payload
+    # @param [Context|Hash] context
+    # @param [Hash|String|nil] credentials injects into credentials
+    # @param [String|nil] name (defaults to State Machine)
     def initialize(payload, context = nil, credentials = nil, name = nil)
-      payload     = JSON.parse(payload)     if payload.kind_of?(String)
-      credentials = JSON.parse(credentials) if credentials.kind_of?(String)
-      context     = Context.new(context)    unless context.kind_of?(Context)
+      payload     = self.class.safe_parse("Payload", payload, error: InvalidWorkflowError) if payload.kind_of?(String)
+      credentials = self.class.safe_parse("Credentials", credentials) if credentials.kind_of?(String)
+      context     = Context.new(context) unless context.kind_of?(Context)
 
       # backwards compatibility
       # caller should really put credentials into context and not pass that variable
@@ -194,5 +198,11 @@ def step!
     def end_workflow!
       context.execution["EndTime"] = context.state["FinishedTime"]
     end
+
+    def self.safe_parse(field, string, error: Floe::InvalidExecutionInput)
+      JSON.parse(string)
+    rescue JSON::ParserError => err
+      raise error, "Invalid State Machine #{field}: #{err}: was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')"
+    end
   end
 end

lib/floe/workflow/context.rb

@@ -8,8 +8,8 @@ class Context
       # @param context [Json|Hash] (default, create another with input and execution params)
       # @param input [Hash] (default: {})
       def initialize(context = nil, input: nil, credentials: nil, logger: nil)
-        context = JSON.parse(context) if context.kind_of?(String)
-        input   = JSON.parse(input || "{}")
+        context = self.class.safe_parse("Execution Context", context) if context.kind_of?(String)
+        input   = self.class.safe_parse("Execution Input", input || "{}")
 
         @context = context || {}
         self["Credentials"]        ||= credentials || {}
@@ -21,8 +21,6 @@ def initialize(context = nil, input: nil, credentials: nil, logger: nil)
         self["Task"]               ||= {}
 
         self.logger = logger if logger
-      rescue JSON::ParserError => err
-        raise Floe::InvalidExecutionInput, "Invalid State Machine Execution Input: #{err}: was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')"
       end
 
       def execution
@@ -152,6 +150,18 @@ def to_h
       def safe_context
         @context.except("Credentials")
       end
+
+      def to_json(*args)
+        to_h.to_json(*args)
+      end
+
+      private
+
+      def self.safe_parse(field, string)
+        JSON.parse(string)
+      rescue JSON::ParserError => err
+        raise Floe::InvalidExecutionInput, "Invalid State Machine #{field}: #{err}: was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')"
+      end
     end
   end
 end