fluere 0.0.1 → 0.0.2

data/lib/fluere.rb

@@ -16,6 +16,10 @@ module Fluere
     @workflows ||= []
   end
 
+  def self.activities
+    @activities ||= []
+  end
+
   def self.swf
     @swf ||= AWS::SimpleWorkflow.new
   end
@@ -25,7 +29,23 @@ module Fluere
   end
 
   def self.prefixed_task_list(task_list)
-    [Fluere::Config.task_list_prefix, task_list].join
+    [Fluere::Config.task_list_prefix, task_list].join('-')
+  end
+
+  def self.default_workflow_options
+    {
+      default_execution_start_to_close_timeout: 60 * 2,
+      default_task_start_to_close_timeout: 60 * 2,
+      default_child_policy: :terminate,
+    }
+  end
+
+  def self.default_activity_options
+    {
+      default_task_schedule_to_close_timeout: 60 * 2,
+      default_task_schedule_to_start_timeout: 60 * 2,
+      default_task_start_to_close_timeout: 60 * 2,
+    }
   end
 
   def self.start_execution(klass, *args)

data/lib/fluere/config.rb

@@ -5,6 +5,7 @@ module Fluere
       attr_accessor :logger
       attr_accessor :use_forking
       attr_accessor :task_list_prefix
+      attr_accessor :version
     end
   end
 end

data/lib/fluere/version.rb

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

data/lib/fluere/worker.rb

@@ -1,42 +1,69 @@
 module Fluere
-  class Worker
-    def self.for(klass)
-      assert_fluere_class(klass)
-      new(klass)
-    end
+  module Worker
+    class Base
+      def task_list
+        raise("abstract")
+      end
 
-    def self.assert_fluere_class(klass)
-      unless klass.respond_to? :fluere_worker_klass
-        raise "must pass class extended with Fluere::Worker or Fluere::Activity"
+      def worker_class
+        raise("abstract")
       end
-    end
 
-    def initialize(klass)
-      @klass = klass
-    end
+      def task_implementations
+        raise("abstract")
+      end
 
-    def aws_flow_worker
-      @aws_flow_worker ||= @klass.fluere_worker_klass.new(
-        Fluere.swf.client,
-        Fluere.domain,
-        Fluere.prefixed_task_list(@klass.task_list),
-        @klass,
-      ) {{
-        logger:      Fluere::Config.logger,
-        use_forking: Fluere::Config.use_forking
-      }}
-    end
+      def aws_flow_worker
+        @aws_flow_worker ||= worker_class.new(
+          Fluere.swf.client,
+          Fluere.domain,
+          task_list,
+          *task_implementations
+        ) {{
+          logger:      Fluere::Config.logger,
+          use_forking: Fluere::Config.use_forking
+        }}
+      end
+
+      def start
+        aws_flow_worker.start
+      end
+
+      def run_once
+        aws_flow_worker.run_once
+      end
 
-    def start
-      aws_flow_worker.start
+      def register
+        aws_flow_worker.register
+      end
     end
 
-    def run_once
-      aws_flow_worker.run_once
+    class Workflow < Base
+      def task_list
+        Fluere.prefixed_task_list('decisions')
+      end
+
+      def worker_class
+        AWS::Flow::WorkflowWorker
+      end
+
+      def task_implementations
+        Fluere.workflows
+      end
     end
 
-    def register
-      aws_flow_worker.register
+    class Activity < Base
+      def task_list
+        Fluere.prefixed_task_list('activities')
+      end
+
+      def worker_class
+        AWS::Flow::ActivityWorker
+      end
+
+      def task_implementations
+        Fluere.activities
+      end
     end
   end
 end

data/lib/fluere/workflow.rb

@@ -1,60 +1,77 @@
 module Fluere
   module Workflow
-    def self.extended(base)
-      base.extend(AWS::Flow::Workflows)
-      base.extend(ClassOverrides)
-      base.send(:include, InstanceOverrides)
-      Fluere.workflows << base
+    def decider(&block)
+      const_set('Decider', Class.new {
+        extend AWS::Flow::Workflows
+
+        def self.aws_name
+          name.gsub(/:/, '_')
+        end
+      })
+
+      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'),
+      )}
+
+      Fluere.workflows << decider_class
     end
 
-    def fluere_worker_klass
-      AWS::Flow::WorkflowWorker
+    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'),
+      )}
+      activities_class.send :define_method, name, &block
+      define_activity_client unless decider_class.respond_to? :activities
+      decider_class.send :define_method, name do |*args|
+        activities.send(name, *args)
+      end
     end
 
-    def start_execution(*args)
-      workflow_client.start_execution(*args)
+    def activities_class
+      @activities_class ||= const_get('Activities')
     end
 
-    def workflow_client
-      AWS::Flow.workflow_client(
-        Fluere.swf.client,
-        Fluere.domain
-      ) {{
-        from_class: self.name
-      }}
+    def decider_class
+      @decider_class ||= const_get('Decider')
     end
 
-    module ClassOverrides
-      def activity_client(name, &block)
-        flow_method = "#{name}_flow".to_sym
-        super(flow_method, &block)
-        define_method(name) do
-          if Fluere.stubbed?
-            klass = self.class.const_get(block.call[:from_class])
-            klass.new
-          else
-            send(flow_method)
-          end
-        end
-      end
+    def define_activities_class
+      const_set('Activities', Class.new {
+        extend AWS::Flow::Activities
 
-      def workflow(name, &block)
-        super(name) do
-          block.call.tap do |workflow_options|
-            workflow_options[:task_list] = Fluere.prefixed_task_list(workflow_options[:task_list])
-          end
+        def self.aws_name
+          name.gsub(/:/, '_')
         end
-      end
+      })
+      Fluere.activities << activities_class
     end
 
-    module InstanceOverrides
-      def wait_for_all(*args)
-        if Fluere.stubbed?
-          true # pass
-        else
-          super(*args)
-        end
-      end
+    def define_activity_client
+      decider_class.activity_client(:activities) {{
+        prefix_name: activities_class.aws_name,
+        version: Fluere::Config.version
+      }}
+    end
+
+    def start_execution(*args)
+      workflow_client.start_execution(:run, *args)
+    end
+
+    def workflow_client
+      @workflow_client ||= AWS::Flow.workflow_client(
+        Fluere.swf.client,
+        Fluere.domain
+      ) {{
+        workflow_name: decider_class.aws_name,
+        execution_method: "run",
+        version: Fluere::Config.version,
+      }}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluere
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,6 @@ files:
 - Rakefile
 - fluere.gemspec
 - lib/fluere.rb
-- lib/fluere/activity.rb
 - lib/fluere/config.rb
 - lib/fluere/exceptions.rb
 - lib/fluere/version.rb
@@ -111,18 +110,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3200458554492036828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3200458554492036828
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -133,3 +126,4 @@ test_files:
 - test/fluere/activity_test.rb
 - test/fluere/workflow_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/lib/fluere/activity.rb

@@ -1,30 +0,0 @@
-module Fluere
-  module Activity
-    def self.extended(base)
-      base.extend AWS::Flow::Activities
-      base.extend ClassOverrides
-      base.send(:include, InstanceOverrides)
-    end
-
-    def fluere_worker_klass
-      AWS::Flow::ActivityWorker
-    end
-
-    module ClassOverrides
-      def activity(name, &block)
-        super(name) do
-          block.call.tap do |activity_options|
-            activity_options[:task_list] = Fluere.prefixed_task_list(activity_options[:default_task_list])
-          end
-        end
-      end
-    end
-
-    module InstanceOverrides
-      def send_async(*args)
-        Fluere.assert_stubbed
-        self.send(*args)
-      end
-    end
-  end
-end