seam-sidekiq 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71af6b88f63849c495d2706982fcc60b0b5a5475
-  data.tar.gz: 2d9acddc6ec475787bdd2d24b0e1aad7f801f4b8
+  metadata.gz: 9a61a9f0a91398bef9f2100f1f46e7792bb2a3eb
+  data.tar.gz: fd74ccb2b2a998928f8ed98f00df43908cf94707
 SHA512:
-  metadata.gz: 0afdcc79715e9ae7a04d012e600e9da9224e3419850baf0c3be2e58c028b98222433d6fe58678ec8e258b49818717f8a84c5c25f323f216ce269108a281944dd
-  data.tar.gz: c732c97eb385348704313b53de36c5d6c447674fb1825e73cc22ac80d96a2490c9292830654428ae87e7bb1e58a9d43f97ad0727f4757625b3cb5ba0fe3965e6
+  metadata.gz: d47cab22355cfffb8979a5bac1fcf7ac7db3fedca4a050c9846bfcd492e3b6253351031a55b470a88452afd631d71cb72258e6706d5c39833bc6993202176c90
+  data.tar.gz: a1161e82722ade69bc1880704d86e3dc885a922b0ccfbbd0e9ca24b504fc8a82261676e61e39961ee4fb2202c7b7f99d4bfde4650f9f6edc771323c699556621

data/lib/seam/sidekiq.rb

@@ -1,7 +1,9 @@
 require 'seam'
 
 module Seam
+
   module Sidekiq
+
     def self.setup
       ::Seam::Worker.class_eval do
         include ::Sidekiq::Worker
@@ -9,16 +11,53 @@ module Seam
         def perform effort_id
           effort = Seam::Effort.find effort_id
           execute effort
-          next_worker = Seam::Worker.handler_for effort.next_step
-          if next_worker
-            if effort.next_execute_at <= Time.now
-              next_worker.class.perform_async effort.id
-            else
-              next_worker.class.perform_in effort.next_execute_at - Time.now, effort.id
-            end
-          end
+          ::Seam::Sidekiq.fire_the_worker_for_the_next_step_of effort
+        end
+      end
+
+      ::Seam::Flow.class_eval do
+        alias :the_default_start_for :start
+        def start(data = {})
+          effort = the_default_start_for data
+          ::Seam::Sidekiq.fire_the_worker_for_the_next_step_of effort
+          effort
         end
       end
     end
+
+    def self.fire_the_worker_for_the_next_step_of effort
+      return unless worker = the_next_worker_for(effort)
+      this_should_be_executed_in_the_future(effort) ?
+        execute_this_in_the_future(worker, effort) :
+        execute_this_now(worker, effort)
+    end
+
+    class << self
+
+      private
+
+      def execute_this_in_the_future worker, effort
+        worker.class.perform_in time_until(effort), effort.id
+      end
+
+      def execute_this_now worker, effort
+        worker.class.perform_async effort.id
+      end
+
+      def the_next_worker_for effort
+        Seam::Worker.handler_for effort.next_step
+      end
+
+      def time_until effort
+        effort.next_execute_at - Time.now
+      end
+
+      def this_should_be_executed_in_the_future effort
+        effort.next_execute_at > Time.now
+      end
+
+    end
+
   end
+
 end

data/lib/seam/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Seam
   module Sidekiq
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seam-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Darren Cauthon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: seam