seam 0.0.7 → 0.0.8

data/lib/seam/version.rb

@@ -1,3 +1,3 @@
 module Seam
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/seam/worker.rb

@@ -1,9 +1,61 @@
 module Seam
   class Worker
-    def handles(step)
+    def handles step
       @step = step
     end
 
+    def execute effort
+      set_current_effort effort
+      before_process
+      process
+      after_process
+    end
+
+    def execute_all
+      efforts_to_execute.each { |e| execute e }
+    end
+
+    def eject
+      @operation_to_execute = :eject
+    end
+
+    def move_to_next_step
+      @operation_to_execute = :move_to_next_step
+    end
+
+    def try_again_in seconds
+      @operation_to_execute    = :try_again_in
+      operation_args[:seconds] = seconds
+    end
+
+    attr_accessor :operation_args
+    def operation_args
+      @operation_args ||= {}
+    end
+
+    def operations
+      {
+        try_again_in:      -> do
+                                seconds = operation_args[:seconds]
+                                try_again_on = Time.now + seconds
+
+                                history[:try_again_on] = try_again_on
+
+                                effort.next_execute_at = try_again_on
+                              end,
+        move_to_next_step: -> do
+                                effort.completed_steps << effort.next_step
+
+                                steps = effort.flow['steps'].map { |x| x['name'] }
+                                next_step = steps[effort.completed_steps.count]
+
+                                effort.next_step = next_step
+                                mark_effort_as_complete if next_step.nil?
+                              end,
+        eject:             -> { mark_effort_as_complete }
+      }
+    end
+
     def effort
       @current_effort
     end
@@ -12,53 +64,56 @@ module Seam
       @current_run
     end
 
-    def execute effort
-      @current_run = HashWithIndifferentAccess.new( { 
-                                                      started_at: Time.now,
-                                                      step: @step.to_s, 
-                                                      data_before: effort.data.clone,
-                                                    } )
+    private
+
+    def mark_effort_as_complete
+      effort.next_step    = nil
+      effort.complete     = true
+      effort.completed_at = Time.now
+    end
+
+    def set_current_effort effort
       @current_effort = effort
-      process
-      history[:data_after] = effort.data.clone
-      history[:stopped_at] = Time.now
-      effort.history << history
-      effort.save
     end
 
-    def execute_all
-      Seam::Effort.find_all_by_step(@step.to_s).each do |effort|
-        execute effort
-      end
+    def before_process
+      run = { 
+              started_at:  Time.now,
+              step:        step, 
+              data_before: effort.data.clone
+            }
+      @current_run = HashWithIndifferentAccess.new run
     end
 
-    def eject
-      history[:result] = "eject"
-      effort.complete     = true
-      effort.completed_at = Time.now
-      effort.next_step    = nil
-      effort.save
+    def after_process
+      execute_the_appropriate_operation
+      stamp_the_new_history_record
+      save_the_effort
     end
 
-    def move_to_next_step
-      history[:result] = "move_to_next_step"
-      effort.completed_steps << effort.next_step
+    def efforts_to_execute
+      Seam::Effort.find_all_by_step step
+    end
 
-      steps = effort.flow['steps'].map { |x| x['name'] }
+    def step
+      s = @step || self.class.name.underscore.gsub('_worker', '')
+      s.to_s
+    end
 
-      next_step = steps[effort.completed_steps.count]
-      effort.next_step = next_step
-      effort.complete  = next_step.nil?
-      effort.save
+    def execute_the_appropriate_operation
+      @operation_to_execute ||= :move_to_next_step
+      operations[@operation_to_execute].call
     end
 
-    def try_again_in seconds
-      try_again_on = Time.now + seconds
+    def stamp_the_new_history_record
+      history[:result]     = @operation_to_execute
+      history[:data_after] = effort.data.clone
+      history[:stopped_at] = Time.now
 
-      history[:result] = "try_again_in"
-      history[:try_again_on] = try_again_on
+      effort.history << history
+    end
 
-      effort.next_execute_at = try_again_on
+    def save_the_effort
       effort.save
     end
   end

data/spec/seam/worker_spec.rb

@@ -34,6 +34,29 @@ describe "worker" do
     end
   end
 
+  describe "move_to_next_step as a default" do
+    it "should go to move_to_next_step by default" do
+      flow = Seam::Flow.new
+      flow.apple
+      flow.orange
+
+      effort = flow.start( { first_name: 'John' } )
+      effort = Seam::Effort.find(effort.id)
+
+      effort.next_step.must_equal "apple"
+
+      apple_worker = Seam::Worker.new
+      apple_worker.handles(:apple)
+      def apple_worker.process
+      end
+
+      apple_worker.execute effort
+
+      effort = Seam::Effort.find(effort.id)
+      effort.next_step.must_equal "orange"
+    end
+  end
+
   describe "try_again_in" do
 
     let(:effort) do
@@ -271,7 +294,7 @@ describe "worker" do
       effort.data['hit 3'].must_equal 1
 
       effort.complete?.must_equal true
-      #effort.completed_at.must_equal Time.now
+      effort.completed_at.must_equal Time.now
       
       # FUTURE WAVES
       send_postcard_if_necessary_worker.execute_all
@@ -575,10 +598,43 @@ describe "worker" do
       fresh_effort = Seam::Effort.find(effort.id)
       fresh_effort.next_step.nil?.must_equal true
     end
+
+    it "should mark the completed_at date" do
+      fresh_effort = Seam::Effort.find(effort.id)
+      fresh_effort.completed_at.must_equal Time.now
+    end
     
     it "should mark the history" do
       effort.history[0].contrast_with!({"step"=>"apple", "result" => "eject" } )
     end
 
   end
+
+  describe "use the name of the worker to tie to a step" do
+
+    let(:effort) do
+      flow = Seam::Flow.new
+      flow.i_will_not_call_handles
+
+      e = flow.start
+      Seam::Effort.find(e.id)
+    end
+
+    before do
+      effort
+      worker = IWillNotCallHandlesWorker.new
+      IWillNotCallHandlesWorker.new.execute_all
+    end
+
+    it "should complete the effort" do
+      fresh_effort = Seam::Effort.find effort.id
+      fresh_effort.complete?.must_equal true
+    end
+
+  end
+end
+
+class IWillNotCallHandlesWorker < Seam::Worker
+  # no calling handles here
+  def process; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seam
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -227,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1708529221048095917
+      hash: -2272473425204476348
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1708529221048095917
+      hash: -2272473425204476348
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24