lib/floe/workflow.rb in floe-0.7.1 vs lib/floe/workflow.rb in floe-0.8.0

@@ -6,13 +6,16 @@
 module Floe
   class Workflow
     include Logging
 
     class << self
-      def load(path_or_io, context = nil, credentials = {})
+      def load(path_or_io, context = nil, credentials = {}, name = nil)
         payload = path_or_io.respond_to?(:read) ? path_or_io.read : File.read(path_or_io)
-        new(payload, context, credentials)
+        # default the name if it is a filename and none was passed in
+        name ||= path_or_io.respond_to?(:read) ? "stream" : path_or_io.split("/").last.split(".").first
+
+        new(payload, context, credentials, name)
       end
 
       def wait(workflows, timeout: 5)
         logger.info("checking #{workflows.count} workflows...")
 
@@ -29,44 +32,35 @@
         logger.info("checking #{workflows.count} workflows...Complete - #{ready.count} ready")
         ready
       end
     end
 
-    attr_reader :context, :credentials, :payload, :states, :states_by_name, :start_at
+    attr_reader :context, :credentials, :payload, :states, :states_by_name, :start_at, :name
 
-    def initialize(payload, context = nil, credentials = {})
+    def initialize(payload, context = nil, credentials = {}, 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)
 
       raise Floe::InvalidWorkflowError, "Missing field \"States\""  if payload["States"].nil?
       raise Floe::InvalidWorkflowError, "Missing field \"StartAt\"" if payload["StartAt"].nil?
       raise Floe::InvalidWorkflowError, "\"StartAt\" not in the \"States\" field" unless payload["States"].key?(payload["StartAt"])
 
+      @name        = name
       @payload     = payload
       @context     = context
       @credentials = credentials || {}
       @start_at    = payload["StartAt"]
 
-      @states         = payload["States"].to_a.map { |name, state| State.build!(self, name, state) }
+      @states         = payload["States"].to_a.map { |state_name, state| State.build!(self, state_name, state) }
       @states_by_name = @states.each_with_object({}) { |state, result| result[state.name] = state }
 
       unless context.state.key?("Name")
         context.state["Name"] = start_at
         context.state["Input"] = context.execution["Input"].dup
       end
     rescue JSON::ParserError => err
       raise Floe::InvalidWorkflowError, err.message
-    end
-
-    def run!
-      step until end?
-      self
-    end
-
-    def step
-      step_nonblock_wait until step_nonblock == 0
-      self
     end
 
     def run_nonblock
       loop while step_nonblock == 0 && !end?
       self