fluere 0.0.2 → 0.0.3

data/lib/fluere.rb

@@ -1,6 +1,5 @@
 require 'aws/decider'
 
-require 'fluere/activity'
 require 'fluere/config'
 require 'fluere/exceptions'
 require 'fluere/version'
@@ -16,6 +15,14 @@ module Fluere
     @workflows ||= []
   end
 
+  def self.decisions_task_list
+    Fluere.prefixed_task_list('decisions')
+  end
+
+  def self.activities_task_list
+    Fluere.prefixed_task_list('activities')
+  end
+
   def self.activities
     @activities ||= []
   end
@@ -51,8 +58,7 @@ module Fluere
   def self.start_execution(klass, *args)
     if stubbed?
       if perform_executions?
-        method = klass.workflows.first.options.execution_method.to_sym
-        klass.new.send(method, *args)
+        klass.decider_class.new.send(Fluere::Workflow::EXECUTION_METHOD, *args)
       end
     else
       klass.workflow_client.start_execution(*args)

data/lib/fluere/version.rb

@@ -1,3 +1,3 @@
 module Fluere
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/fluere/worker.rb

@@ -40,7 +40,7 @@ module Fluere
 
     class Workflow < Base
       def task_list
-        Fluere.prefixed_task_list('decisions')
+        Fluere.decisions_task_list
       end
 
       def worker_class
@@ -54,7 +54,7 @@ module Fluere
 
     class Activity < Base
       def task_list
-        Fluere.prefixed_task_list('activities')
+        Fluere.activities_task_list
       end
 
       def worker_class

data/lib/fluere/workflow.rb

@@ -1,66 +1,91 @@
 module Fluere
   module Workflow
+    EXECUTION_METHOD = :run
+
     def decider(&block)
-      const_set('Decider', Class.new {
-        extend AWS::Flow::Workflows
+      # Set the provided block as the workflow execution method
+      decider_class.send :define_method, EXECUTION_METHOD, &block
 
-        def self.aws_name
-          name.gsub(/:/, '_')
-        end
-      })
+      # Wire that method in as an AWS Flow workflow
+      decider_class.workflow(EXECUTION_METHOD) {
+        Fluere.default_workflow_options.merge(
+          prefix_name:       decider_class.aws_name,
+          version:           Fluere::Config.version,
+        )
+      }
 
-      decider_class.send :define_method, :run, &block
-      decider_class.workflow(:run) { Fluere.default_workflow_options.merge(
-        prefix_name:       decider_class.aws_name,
-        version:           Fluere::Config.version,
-        default_task_list: Fluere.prefixed_task_list('decisions'),
-      )}
+      # Give the decider a direct reference to activities for use in stubbed
+      # implementations
+      activities_class.tap do |klass|
+        decider_class.send(:define_method, :activities_class) { klass }
+      end
 
-      Fluere.workflows << decider_class
+      # Establish the activity client which will be used in defining the helper
+      # method for each activity (when we are not stubbed)
+      decider_class.activity_client(:activities_client) {{
+        prefix_name: activities_class.aws_name,
+        version:     Fluere::Config.version,
+        task_list:   Fluere.activities_task_list
+      }}
     end
 
     def activity(name, &block)
-      define_activities_class unless defined? Activities
-      activities_class.activity(name) { Fluere.default_activity_options.merge(
-        prefix_name: activities_class.aws_name,
-        version:     Fluere::Config.version,
-        default_task_list: Fluere.prefixed_task_list('activities'),
-      )}
+      # Define a method to be used as the activity implementation
       activities_class.send :define_method, name, &block
-      define_activity_client unless decider_class.respond_to? :activities
+
+      # Wire this method in as an AWS Flow activity
+      activities_class.activity(name) {
+        Fluere.default_activity_options.merge(
+          prefix_name: activities_class.aws_name,
+          version:     Fluere::Config.version,
+        )
+      }
+
+      # Establish a shortcut method for the decider implementation to use to
+      # call this activity as though it were a local method
       decider_class.send :define_method, name do |*args|
-        activities.send(name, *args)
+        if Fluere.stubbed?
+          activities_class.new.send(name, *args)
+        else
+          activities_client.send(name, *args)
+        end
       end
     end
 
     def activities_class
-      @activities_class ||= const_get('Activities')
-    end
+      @activities_class ||= const_set('Activities', Class.new {
+        extend AWS::Flow::Activities
 
-    def decider_class
-      @decider_class ||= const_get('Decider')
+        # Stupid AWS doesn't allow colons in workflow or activity type names...
+        def self.aws_name
+          name.gsub(/:/, '_')
+        end
+      }).tap { |a| Fluere.activities << a }
     end
 
-    def define_activities_class
-      const_set('Activities', Class.new {
-        extend AWS::Flow::Activities
+    def decider_class
+      @decider_class ||= const_set('Decider', Class.new {
+        extend AWS::Flow::Workflows
 
+        # Stupid AWS doesn't allow colons in workflow or activity type names...
         def self.aws_name
           name.gsub(/:/, '_')
         end
-      })
-      Fluere.activities << activities_class
-    end
 
-    def define_activity_client
-      decider_class.activity_client(:activities) {{
-        prefix_name: activities_class.aws_name,
-        version: Fluere::Config.version
-      }}
-    end
+        def send_async(*args)
+          if Fluere.stubbed?
+            activities_class.new.send(*args)
+          else
+            activities_client.send_async(*args)
+          end
+        end
 
-    def start_execution(*args)
-      workflow_client.start_execution(:run, *args)
+        def wait_for_all(*args)
+          unless Fluere.stubbed?
+            super
+          end
+        end
+      }).tap { |d| Fluere.workflows << d }
     end
 
     def workflow_client
@@ -68,9 +93,10 @@ module Fluere
         Fluere.swf.client,
         Fluere.domain
       ) {{
-        workflow_name: decider_class.aws_name,
-        execution_method: "run",
-        version: Fluere::Config.version,
+        workflow_name:    decider_class.aws_name,
+        execution_method: EXECUTION_METHOD,
+        version:          Fluere::Config.version,
+        task_list:        Fluere.decisions_task_list
       }}
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluere
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler