rekiq 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6b35a349d92b73f219e0d576bc246eb57447f5
-  data.tar.gz: b26a1901ec408176fedc25be6a51f66d5849bd59
+  metadata.gz: 076c615c498fc220128027310ad06d8bb2bb994f
+  data.tar.gz: 7e5af8a28c1c9091a5fd525b14618f207bf4ac1a
 SHA512:
-  metadata.gz: d9a7e979b1f492540c788747b3dd7854ed3f27b1567bec4c15d568c65fd7df6715a7745c77d335bab19a8438e27b6f49ce8cff9596a891c87eedb357b05c3cd0
-  data.tar.gz: 491e3f5219bc3e0bae2ad6e725a3af8ad8844a0d324059d7cc7e817515f01617e861cac634a9cf7b472d334d6f43239b7fe74164a9dd0de850ef0ae6e8f1a036
+  metadata.gz: f98477c020f73f06565d30c9056836ea99aa6a667f15d1ecc7744f772ffd9930e8cb419537063bf94c74afe0e969eec1cd0eee7afaa9c47f0a31532c441e9990
+  data.tar.gz: 0fc94f9ea4c19c537d2b9187e9232a7b3cb5c8fbf51edddd8a9d447e06a5c3535949e7c96f34a5e95845691c39f00eff2389984b2c6a1dd79f573c25c7ede296

data/.gitignore

@@ -21,3 +21,5 @@ tmp
 *.a
 mkmf.log
 example/tmp
+
+dump.rdb

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.2.0

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 rvm:
+  - 2.2.0
   - 2.1.1
   - 2.0.0
-script: CODECLIMATE_REPO_TOKEN=13221c16cb92c5dc8312b2f2f9f4960271e67845ba5e2852dbba3d786ccf2c81 bundle exec rspec
+script: CODECLIMATE_REPO_TOKEN=13221c16cb92c5dc8312b2f2f9f4960271e67845ba5e2852dbba3d786ccf2c81 bundle exec rspec
+before_install: gem install bundler

data/README.md

@@ -11,10 +11,10 @@
 
 Rekiq extends Sidekiq and adds functionality to schedule recurring workers.
 
-Sidekiq is an amazing gem that allows us to execute work asynchronous, or
-even schedule that work to be run at a given time. Now, wouldn't it be
-nice if it also allowed us to schedule a worker to do recurring work? That's
-what rekiq purposes to do.
+Sidekiq is an amazing gem that allows us to execute work asynchronously, or
+even schedule work to be run at a given time. Now, wouldn't it be nice
+if it also allowed us to schedule a worker to do recurring work? That's
+the purpose of rekiq.
 
 For example, rekiq allows you to schedule a worker to repeat the same
 work every friday at 23:00.
@@ -23,9 +23,9 @@ work every friday at 23:00.
 
 Tested with:
 
-  * ruby 2.1.1, 2.0.0
+  * ruby 2.2.0, 2.1.1, 2.0.0
 
-  * sidekiq 3.2.2
+  * sidekiq 3.3.3
 
 ## Installation
 

data/lib/rekiq/configuration.rb

@@ -15,22 +15,22 @@ module Rekiq
     def initialize
       # indicates if next work is scheduled after or before the worker completes
       # this is relevant when we want to guarantee that workers do not run in paralel
-      # default false
+      # type bool, default false
       @schedule_post_work = false
 
       # indicates a shift, in seconds, to apply to event time returned from schedule
       # to calculate the work_time
-      # default 0
+      # type int, default 0
       @work_time_shift = 0
 
       # indicates the tolerance, in seconds, for work_time relative to current time
-      # default 0 and must be greater than or equal to 0
+      # type int (value greater than or equal to 0), default 0
       @work_time_tolerance = 0
 
       # indicates if expired work_times are to be scheduled
       # a work_time is considered expired when it's before current time minus
       # work_time_tolerance
-      # default false
+      # type bool, default false
       @schedule_expired = false
     end
   end

data/lib/rekiq/contract.rb

@@ -17,14 +17,13 @@ module Rekiq
 
     class << self
       def from_hash(hash)
-        new \
-          'schedule'            => Marshal.load(hash['s'].encode('ISO-8859-1')),
-          'cancel_args'         => hash['ca'],
-          'addon'               => hash['ao'],
-          'schedule_post_work'  => hash['pw'],
-          'work_time_shift'     => hash['ws'],
-          'work_time_tolerance' => hash['wt'],
-          'schedule_expired'    => hash['se']
+        new 'schedule'            => Marshal.load(hash['s'].encode('ISO-8859-1')),
+            'cancel_args'         => hash['ca'],
+            'addon'               => hash['ao'],
+            'schedule_post_work'  => hash['pw'],
+            'work_time_shift'     => hash['ws'],
+            'work_time_tolerance' => hash['wt'],
+            'schedule_expired'    => hash['se']
       end
     end
 

data/lib/rekiq/middleware/work_overseer.rb

@@ -40,7 +40,7 @@ module Rekiq
     protected
 
       def set_rekiq_worker_attributes
-        @worker.scheduled_work_time      = Time.at(@msg['rq:at'].to_f).utc
+        @worker.scheduled_work_time      = Time.at(@msg['rq:at'].to_f)
         @worker.estimated_next_work_time =
           @contract.next_work_time(@worker.scheduled_work_time)
       end
@@ -49,7 +49,7 @@ module Rekiq
         @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/scheduler.rb

@@ -24,17 +24,14 @@ module Rekiq
     end
 
     def push_to_redis
-      client_args = {
-        'at'     => @work_time.to_f,
-        'queue'  => @queue,
-        'class'  => @worker_name,
-        'args'   => @args,
-        'rq:ctr' => @contract.to_hash,
-        'rq:sdl' => nil,
-        'rq:at'  => @work_time.to_f # this needs to be here because the key 'at' is removed by sidekiq
-      }
-
-      Sidekiq::Client.push(client_args)
+      Sidekiq::Client
+        .push 'at'     => @work_time.to_f,
+              'queue'  => @queue,
+              'class'  => @worker_name,
+              'args'   => @args,
+              'rq:ctr' => @contract.to_hash,
+              'rq:sdl' => nil,
+              'rq:at'  => @work_time.to_f # this needs to be here because the key 'at' is removed by sidekiq
     end
   end
 end

data/lib/rekiq/version.rb

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

data/lib/rekiq/worker.rb

@@ -47,6 +47,7 @@ module Rekiq
 
         jid
       end
+      alias_method :perform_schedule, :perform_recurringly
 
     protected
 

data/rekiq.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
-  spec.add_development_dependency 'factory_girl', '~> 4.4'
+  spec.add_development_dependency 'factory_girl', '~> 4.5'
   spec.add_development_dependency 'ice_cube', '~> 0.12'
-  spec.add_development_dependency 'sidekiq', '~> 3.2'
+  spec.add_development_dependency 'sidekiq', '~> 3.3'
 
-  # spec.add_development_dependency 'jazz_hands', '~> 0.5'
+  spec.add_development_dependency 'pry'
 end

data/spec/rekiq/worker_spec.rb

@@ -25,19 +25,44 @@ describe Rekiq::Worker do
       ExampleWorker.respond_to? :perform_recurringly
     end
 
-    describe '.perform_recurringly' do
-      context 'for schedule that does not return next occurrence' do
+    it 'responds to perform_schedule' do
+      ExampleWorker.respond_to? :perform_schedule
+    end
+
+    describe '.perform_recurringly (alias .perform_schedule)' do
+      context 'for schedule that is set to one hour ago' do
         let(:schedule) { IceCube::Schedule.new(Time.now - 3600) }
-        before do
-          @jid = ExampleWorker.perform_recurringly(schedule)
-        end
 
-        it 'returns nil' do
-          expect(@jid).to eq(nil)
+        context 'with default config' do
+          before do
+            @jid = ExampleWorker.perform_recurringly(schedule)
+          end
+
+          it 'returns nil' do
+            expect(@jid).to eq(nil)
+          end
+
+          it 'does not schedule worker' do
+            expect(ExampleWorker.jobs.count).to eq(0)
+          end
         end
 
-        it 'does not schedule worker' do
-          expect(ExampleWorker.jobs.count).to eq(0)
+        context 'configured to start at two hours ago and ' \
+                'set to schedule expired work' do
+          before do
+            @jid = ExampleWorker.perform_recurringly(schedule) do |config|
+              config.starting_at = Time.now - 7200
+              config.schedule_expired = true
+            end
+          end
+
+          it 'returns a jid' do
+            expect(@jid).not_to eq(nil)
+          end
+
+          it 'does not schedule worker' do
+            expect(ExampleWorker.jobs.count).to eq(1)
+          end
         end
       end
 

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'factory_girl'
 require 'sidekiq'
 require 'sidekiq/testing'
 require 'rekiq'
+require 'pry'
 
 # configure sidekiq for testing
 Sidekiq::Testing.fake!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - junhanamaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Rekiq extends Sidekiq to allow the scheduling of
                             recurring workers
@@ -166,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Recurring worker extension for Sidekiq
@@ -179,4 +193,3 @@ test_files:
 - spec/rekiq/scheduler_spec.rb
 - spec/rekiq/worker_spec.rb
 - spec/spec_helper.rb
-has_rdoc: