rekiq 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35103e24fdf19a9103b5413045b7b9519f31b5c
-  data.tar.gz: d370ec60d8dfa653b1fc2baab31b4bc9e63ec459
+  metadata.gz: bf6b35a349d92b73f219e0d576bc246eb57447f5
+  data.tar.gz: b26a1901ec408176fedc25be6a51f66d5849bd59
 SHA512:
-  metadata.gz: 8cce22c704902a039b2dfdf721109c292199310a1bcab75398e4d3bcaa2c4cee1109f922ab34f85c59d8d3fbdf61fac02701091dde78f3709f56bbfade159205
-  data.tar.gz: afd6108ae9af9a7285b8aa8afc7ec4af58892d0dcba5c71e1208150c36169230e6cb58207885e5aa889a7611e8b736c932157a97b8e3e23c38e13711992497bf
+  metadata.gz: d9a7e979b1f492540c788747b3dd7854ed3f27b1567bec4c15d568c65fd7df6715a7745c77d335bab19a8438e27b6f49ce8cff9596a891c87eedb357b05c3cd0
+  data.tar.gz: 491e3f5219bc3e0bae2ad6e725a3af8ad8844a0d324059d7cc7e817515f01617e861cac634a9cf7b472d334d6f43239b7fe74164a9dd0de850ef0ae6e8f1a036

data/lib/rekiq/middleware/work_overseer.rb

@@ -17,6 +17,8 @@ module Rekiq
         @queue       = queue
         @contract    = Contract.from_hash(msg['rq:ctr'])
 
+        set_rekiq_worker_attributes
+
         if cancel_worker?
           return logger.info "worker #{@worker_name} was canceled"
         end
@@ -37,11 +39,17 @@ module Rekiq
 
     protected
 
+      def set_rekiq_worker_attributes
+        @worker.scheduled_work_time      = Time.at(@msg['rq:at'].to_f).utc
+        @worker.estimated_next_work_time =
+          @contract.next_work_time(@worker.scheduled_work_time)
+      end
+
       def cancel_worker?
         @worker.cancel_rekiq_worker?(*@contract.cancel_args)
       end
 
-      def reschedule
+      def reschedule()
         jid, work_time =
           Rekiq::Scheduler
             .new(@worker_name, @queue, @msg['args'], @contract)

data/lib/rekiq/version.rb

@@ -1,3 +1,3 @@
 module Rekiq
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/rekiq/worker.rb

@@ -66,7 +66,7 @@ end
 
 module Sidekiq
   module Worker
-    attr_accessor :scheduled_work_time
+    attr_accessor :scheduled_work_time, :estimated_next_work_time
 
     original_included_method = method(:included)
 

data/lib/rekiq.rb

@@ -12,11 +12,9 @@ end
 
 require 'rekiq/worker'
 require 'rekiq/middleware/work_overseer'
-require 'rekiq/middleware/utils'
 
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.add Rekiq::Middleware::Utils
     chain.add Rekiq::Middleware::WorkOverseer
   end
 end

data/spec/rekiq/middleware/work_overseer_spec.rb

@@ -20,21 +20,34 @@ describe Rekiq::Middleware::WorkOverseer do
 
   describe '#call' do
     let(:args)        { [] }
-    let(:schedule)    { IceCube::Schedule.new(Time.new + 3600) }
+    let(:schedule) do
+      IceCube::Schedule.new(Time.new + 3600) do |s|
+        s.rrule IceCube::Rule.daily
+      end
+    end
     let(:overseer)    { Rekiq::Middleware::WorkOverseer.new }
     let(:cancel_args) { nil }
     let(:contract) do
       build :contract, schedule: schedule, cancel_args: cancel_args
     end
+    let(:scheduled_work_time) { Time.at(Time.now.to_f) }
+
+    before { overseer.call(worker, msg, queue) {} rescue nil }
 
     context 'worker without rekiq_cancel_method configured' do
       let(:worker) { WorkOverseerTestWorker.new }
       let(:queue)  { WorkOverseerTestWorker.get_sidekiq_options['queue'] }
 
       context 'msg with rq:ctr key (existing contract), ' \
-              'with rq:sdl key (value is irrelevant)' do
+              'with rq:sdl key (value is irrelevant), '   \
+              'with rq:at key' do
         let(:msg) do
-          { 'rq:ctr' => contract.to_hash, 'args' => args, 'rq:sdl' => nil }
+          {
+            'rq:ctr' => contract.to_hash,
+            'args'   => args,
+            'rq:sdl' => nil,
+            'rq:at'  => scheduled_work_time.to_f
+          }
         end
 
         it 'yields once' do
@@ -44,14 +57,19 @@ describe Rekiq::Middleware::WorkOverseer do
         end
 
         it 'schedules worker' do
-          overseer.call(worker, msg, queue) {}
-
           expect(WorkOverseerTestWorker.jobs.count).to eq(1)
         end
 
-        it 'removes key rq:sdl from message after invocation' do
-          overseer.call(worker, msg, queue) {}
+        it 'sets scheduled_work_time attribute in worker' do
+          expect(worker.scheduled_work_time).to eq(scheduled_work_time.utc)
+        end
 
+        it 'sets estimated_next_work_time attribute in worker' do
+          expect(worker.estimated_next_work_time).to \
+            eq(schedule.next_occurrence)
+        end
+
+        it 'removes key rq:sdl from message after invocation' do
           expect(msg.key?('rq:sdl')).to eq(false)
         end
       end
@@ -66,14 +84,22 @@ describe Rekiq::Middleware::WorkOverseer do
         end
 
         it 'does not schedule worker' do
-          overseer.call(worker, msg, queue) {}
-
           expect(WorkOverseerTestWorker.jobs.count).to eq(0)
         end
+
+        it 'scheduled_work_time in worker is unchanged (nil)' do
+          expect(worker.scheduled_work_time).to be_nil
+        end
       end
 
-      context 'msg without key rq:sdl but with key rq:ctr' do
-        let(:msg) { { 'rq:ctr' => contract.to_hash, 'args' => args } }
+      context 'msg without key rq:sdl but with key rq:ctr and rq:at' do
+        let(:msg) do
+          {
+            'rq:ctr' => contract.to_hash,
+            'args'   => args,
+            'rq:at'  => scheduled_work_time.to_f
+          }
+        end
 
         it 'yields once' do
           expect do |b|
@@ -82,8 +108,6 @@ describe Rekiq::Middleware::WorkOverseer do
         end
 
         it 'does not schedule next work' do
-          overseer.call(worker, msg, queue) {}
-
           expect(WorkOverseerTestWorker.jobs.count).to eq(0)
         end
       end
@@ -93,9 +117,16 @@ describe Rekiq::Middleware::WorkOverseer do
       let(:worker) { WorkOverseerCancelTestWorker.new }
       let(:queue)  { WorkOverseerCancelTestWorker.get_sidekiq_options['queue'] }
 
-      context 'msg with keys rc:ctr and rc:sdl' do
+      context 'msg with rq:ctr key (existing contract), ' \
+              'with rq:sdl key (value is irrelevant), '   \
+              'with rq:at key' do
         let(:msg) do
-          { 'rq:ctr' => contract.to_hash, 'args' => args, 'rq:sdl' => nil }
+          {
+            'rq:ctr' => contract.to_hash,
+            'args'   => args,
+            'rq:sdl' => nil,
+            'rq:at'  => scheduled_work_time.to_f
+          }
         end
 
         context 'work is cancelled by cancel method' do
@@ -108,8 +139,6 @@ describe Rekiq::Middleware::WorkOverseer do
           end
 
           it 'does not schedule next work' do
-            overseer.call(worker, msg, queue) {}
-
             expect(WorkOverseerCancelTestWorker.jobs.count).to eq(0)
           end
         end
@@ -124,16 +153,16 @@ describe Rekiq::Middleware::WorkOverseer do
           end
 
           it 'it schedules work' do
-            overseer.call(worker, msg, queue) {}
-
             expect(WorkOverseerCancelTestWorker.jobs.count).to eq(1)
           end
 
           it 'removes key rq:sdl from message after invocation' do
-            overseer.call(worker, msg, queue) {}
-
             expect(msg.key?('rq:sdl')).to eq(false)
           end
+
+          it 'sets scheduled_work_time attribute in worker' do
+            expect(worker.scheduled_work_time).to eq(scheduled_work_time.utc)
+          end
         end
 
         context 'contract with incorrect arity of cancel_args' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - junhanamaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,6 @@ files:
 - lib/rekiq/configuration.rb
 - lib/rekiq/contract.rb
 - lib/rekiq/exceptions.rb
-- lib/rekiq/middleware/utils.rb
 - lib/rekiq/middleware/work_overseer.rb
 - lib/rekiq/scheduler.rb
 - lib/rekiq/validator.rb
@@ -143,7 +142,6 @@ files:
 - spec/factories/contract.rb
 - spec/rekiq/configuration_spec.rb
 - spec/rekiq/contract_spec.rb
-- spec/rekiq/middleware/utils_spec.rb
 - spec/rekiq/middleware/work_overseer_spec.rb
 - spec/rekiq/scheduler_spec.rb
 - spec/rekiq/worker_spec.rb
@@ -177,7 +175,6 @@ test_files:
 - spec/factories/contract.rb
 - spec/rekiq/configuration_spec.rb
 - spec/rekiq/contract_spec.rb
-- spec/rekiq/middleware/utils_spec.rb
 - spec/rekiq/middleware/work_overseer_spec.rb
 - spec/rekiq/scheduler_spec.rb
 - spec/rekiq/worker_spec.rb

data/lib/rekiq/middleware/utils.rb

@@ -1,13 +0,0 @@
-module Rekiq
-  module Middleware
-    class Utils
-      def call(worker, msg, queue)
-        if msg.key?('rq:at')
-          worker.scheduled_work_time = Time.at(msg['rq:at'].to_f).utc
-        end
-
-        yield
-      end
-    end
-  end
-end

data/spec/rekiq/middleware/utils_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe Rekiq::Middleware::Utils do
-  class UtilsTestWorker
-    include Sidekiq::Worker
-  end
-
-  describe '#call' do
-    let(:worker) { UtilsTestWorker.new }
-    let(:queue)  { UtilsTestWorker.get_sidekiq_options['queue'] }
-    let(:utils)  { Rekiq::Middleware::Utils.new }
-    let(:scheduled_work_time) { Time.at(Time.now.to_f) }
-
-    context 'worker responds to scheduled_work_time' do
-      context 'msg hash contains keys rq:ctr and rq:at' do
-        let(:msg) { { 'rq:ctr' => nil, 'rq:at' => scheduled_work_time.to_f } }
-
-        it 'yields passed block' do
-          expect do |b|
-            utils.call(worker, msg, queue, &b)
-          end.to yield_control.once
-        end
-
-        it 'sets scheduled_work_time attribute in worker' do
-          utils.call(worker, msg, queue) {}
-
-          expect(worker.scheduled_work_time).to eq(scheduled_work_time.utc)
-        end
-      end
-
-      context 'msg has no key' do
-        let(:msg) { {} }
-
-        it 'yields passed block' do
-          expect do |b|
-            utils.call(worker, msg, queue, &b)
-          end.to yield_control.once
-        end
-
-        it 'scheduled_work_time is unchanged (nil)' do
-          expect(worker.scheduled_work_time).to be_nil
-        end
-      end
-    end
-  end
-end