rekiq 0.9.3 → 1.0.0

data/spec/rekiq/worker_spec.rb

@@ -45,8 +45,7 @@ describe Rekiq::Worker do
         let(:time)     { Time.now + 3600 }
         let(:schedule) { IceCube::Schedule.new(time) }
 
-        context 'for worker with rekiq_cancel_method set with ' \
-                'non defined method' do
+        context 'for worker with rekiq_cancel_method set with non defined method' do
           before do
             begin
               @jid =
@@ -66,8 +65,7 @@ describe Rekiq::Worker do
           end
         end
 
-        context 'for worker with rekiq_cancel_method set with ' \
-                'defined method' do
+        context 'for worker with rekiq_cancel_method set with defined method' do
           before do
             @jid = RekiqCancelMethodDefinedExampleWorker.perform_recurringly(schedule)
           end
@@ -87,7 +85,7 @@ describe Rekiq::Worker do
           end
 
           it 'schedules worker for one hour from now' do
-            expect(RekiqCancelMethodDefinedExampleWorker.jobs[0]['at']).to eq(time.to_f)
+            expect(RekiqCancelMethodDefinedExampleWorker.jobs[0]['rq:at']).to eq(time.to_f)
           end
         end
 
@@ -105,7 +103,7 @@ describe Rekiq::Worker do
           end
 
           it 'schedules worker for one hour from now' do
-            expect(ExampleWorker.jobs[0]['at']).to eq(time.to_f)
+            expect(ExampleWorker.jobs[0]['rq:at']).to eq(time.to_f)
           end
         end
 
@@ -113,8 +111,8 @@ describe Rekiq::Worker do
           let(:rekiq_cancel_args) { ['args1', 'args2'] }
           before do
             @jid = ExampleWorker.perform_recurringly(schedule) do |config|
-                config.rekiq_cancel_args *rekiq_cancel_args
-              end
+              config.rekiq_cancel_args *rekiq_cancel_args
+            end
           end
 
           it 'returns created job id' do
@@ -130,38 +128,14 @@ describe Rekiq::Worker do
               ExampleWorker.perform_recurringly(schedule, &b)
             end.to yield_control.once
           end
-
-          it 'creates key rq:ca in job hash' do
-            expect(ExampleWorker.jobs[0].key?('rq:ca')).to eq(true)
-          end
-
-          describe 'value under rq:ca key in job hash' do
-            let(:value) { ExampleWorker.jobs[0]['rq:ca'] }
-
-            it 'is an array' do
-              expect(value.class).to eq(Array)
-            end
-
-            it 'has count equal to number of rekiq_cancel_args' do
-              expect(value.count).to eq(rekiq_cancel_args.count)
-            end
-
-            it 'has first element equal to first arg in rekiq_cancel_args' do
-              expect(value[0]).to eq(rekiq_cancel_args[0])
-            end
-
-            it 'has second element equal to second arg in rekiq_cancel_args' do
-              expect(value[1]).to eq(rekiq_cancel_args[1])
-            end
-          end
         end
 
-        context 'shift set to minus 5 minutes' do
-          let(:shift) { -5 * 60 }
+        context 'work_time_shift set to minus 5 minutes' do
+          let(:work_time_shift) { -5 * 60 }
           before do
             @jid = ExampleWorker.perform_recurringly(schedule) do |config|
-                config.shift = shift
-              end
+              config.work_time_shift = work_time_shift
+            end
           end
 
           it 'returns created job id' do
@@ -178,14 +152,8 @@ describe Rekiq::Worker do
             end.to yield_control.once
           end
 
-          it 'sets shift in position 1 of array under key rq:job' do
-            array = ExampleWorker.jobs[0]['rq:job']
-
-            expect(array[1]).to eq(shift)
-          end
-
           it 'schedules worker for one hour minus 5 minutes from now' do
-            expect(ExampleWorker.jobs[0]['at']).to eq(time.to_f + shift)
+            expect(ExampleWorker.jobs[0]['rq:at']).to eq(time.to_f + work_time_shift)
           end
         end
       end

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ else
 end
 
 require 'factory_girl'
-require 'pry'
 require 'sidekiq'
 require 'sidekiq/testing'
 require 'rekiq'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rekiq
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors:
 - junhanamaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
-- !ruby/object:Gem::Dependency
-  name: jazz_hands
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -144,8 +130,8 @@ files:
 - example/test_app.rb
 - lib/rekiq.rb
 - lib/rekiq/configuration.rb
+- lib/rekiq/contract.rb
 - lib/rekiq/exceptions.rb
-- lib/rekiq/job.rb
 - lib/rekiq/middleware/utils.rb
 - lib/rekiq/middleware/work_overseer.rb
 - lib/rekiq/scheduler.rb
@@ -154,9 +140,9 @@ files:
 - lib/rekiq/worker.rb
 - rekiq.gemspec
 - spec/factories/configuration.rb
-- spec/factories/job.rb
+- spec/factories/contract.rb
 - spec/rekiq/configuration_spec.rb
-- spec/rekiq/job_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
@@ -188,9 +174,9 @@ specification_version: 4
 summary: Recurring worker extension for Sidekiq
 test_files:
 - spec/factories/configuration.rb
-- spec/factories/job.rb
+- spec/factories/contract.rb
 - spec/rekiq/configuration_spec.rb
-- spec/rekiq/job_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

data/lib/rekiq/job.rb

@@ -1,110 +0,0 @@
-require 'rekiq/validator'
-require 'rekiq/configuration'
-
-module Rekiq
-  class Job
-    include Validator
-
-    attr_accessor :schedule, :shift, :schedule_post_work, :schedule_expired,
-                  :expiration_margin
-
-    validate :schedule, :schedule
-    validate :shift, :numeric, allow_nil: true
-    validate :schedule_post_work, :bool, allow_nil: true
-    validate :schedule_expired, :numeric, allow_nil: true
-    validate :expiration_margin, :bool, allow_nil: true
-
-    class << self
-      def from_array(array)
-        new \
-          'schedule'           => Marshal.load(array[0].encode('ISO-8859-1')),
-          'shift'              => array[1],
-          'schedule_post_work' => array[2],
-          'schedule_expired'   => array[3],
-          'expiration_margin'  => array[4]
-      end
-    end
-
-    def initialize(attributes = {})
-      self.schedule           = attributes['schedule']
-      self.shift              = attributes['shift']
-      self.schedule_post_work = attributes['schedule_post_work']
-      self.schedule_expired   = attributes['schedule_expired']
-      self.expiration_margin  = attributes['expiration_margin']
-    end
-
-    def to_array
-      [
-        Marshal.dump(schedule).force_encoding('ISO-8859-1').encode('UTF-8'),
-        shift,
-        schedule_post_work,
-        schedule_expired,
-        expiration_margin
-      ]
-    end
-
-    def next_work_time(from = Time.now)
-      from_with_shift = shift_val > 0 ? from - shift_val : from
-
-      search_next_work_time(from_with_shift)
-    end
-
-    def next_work_time_from_work_time(from)
-      from_with_shift = from - shift_val
-
-      search_next_work_time(from_with_shift)
-    end
-
-    def schedule_post_work?
-      unless schedule_post_work.nil?
-        schedule_post_work
-      else
-        Rekiq.configuration.schedule_post_work
-      end
-    end
-
-  private
-
-    def search_next_work_time(from)
-      if schedule_expired?
-        from = schedule.next_occurrence(from)
-        work_time = from.nil? ? nil : from + shift_val
-      else
-        begin
-          from = schedule.next_occurrence(from)
-          work_time = from.nil? ? nil : from + shift_val
-        end until work_time.nil? || work_time > expiration_time
-      end
-
-      work_time
-    end
-
-    def schedule_expired?
-      unless schedule_expired.nil?
-        schedule_expired
-      else
-        Rekiq.configuration.schedule_expired
-      end
-    end
-
-    def expiration_margin_val
-      unless expiration_margin.nil?
-        expiration_margin
-      else
-        Rekiq.configuration.expiration_margin
-      end
-    end
-
-    def shift_val
-      unless shift.nil?
-        shift
-      else
-        Rekiq.configuration.shift
-      end
-    end
-
-    def expiration_time
-      Time.now - expiration_margin_val
-    end
-  end
-end

data/spec/factories/job.rb

@@ -1,15 +0,0 @@
-require 'ice_cube'
-
-FactoryGirl.define do
-  factory :job, class: Rekiq::Job do
-    shift    0
-    schedule IceCube::Schedule.new(Time.now + 3600)
-
-    trait :randomized_attributes do
-      shift              [*0..100].sample
-      schedule_post_work [nil, false, true].sample
-      schedule_expired   [nil, false, true].sample
-      expiration_margin  [*0..100].sample
-    end
-  end
-end