sidekiq-cron 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b46a8aee85dbf5b066d34641a17f4f34ff7307f
-  data.tar.gz: b3d6a7566616aaa7ac5489289f5972432027d5a2
+  metadata.gz: 27adf3b417616b5e594db892be3866efc4911387
+  data.tar.gz: 6e788c3f530ebf8a9ed62fe54da69dd3e18b07ac
 SHA512:
-  metadata.gz: 2d4ef330692ca3f9ea1ca7c9784cec17d8b13b15364426c0b25d604bccf87b39e3bd6e2d1b6c7bd12a52661c8d9675f495ab8f36a8c58bc44960e8dd566a87ef
-  data.tar.gz: 974512d9821df1ec95296be13cd51f4e5490f04eca4b65bc3be2e41756af4570cbde023e1c2a1020187a404507087b3a133173c03b79b8d8ff8a9fe0a04ba7fa
+  metadata.gz: 7cb4c353e7f151e6a9dd8c5749769550fffef3fd00f0d6944029560f73aaa68573b3425fa023a1526d8702ad9dd0bb8a077e53810e3b8d7bd73fd13a57f19f56
+  data.tar.gz: 6646a6b48f28907665b71b37307302b645a8c6fab980cde71612c6b081ee8c90b3f5d88ef199e9e579e9dea3ed7589dd29a42aab60283ee67ec84e0efe32c3bd

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'sidekiq', '>= 4.2.1'
-gem 'rufus-scheduler', '>= 2.0.24'
+gem 'rufus-scheduler', '>= 3.3.0'
 gem 'redis-namespace', '>= 1.5.2'
 
 group :development do

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/sidekiq/cron/job.rb

@@ -79,13 +79,13 @@ module Sidekiq
       end
 
       def enqueue_active_job(klass_const)
-        klass_const.set(queue: @queue_name_with_prefix).perform_later(*@args)
+        klass_const.set(queue: @queue).perform_later(*@args)
 
         true
       end
 
       def enqueue_sidekiq_worker(klass_const)
-        klass_const.set(queue: @queue_name_with_prefix).perform_async(*@args)
+        klass_const.set(queue: queue_name_with_prefix).perform_async(*@args)
 
         true
       end
@@ -306,7 +306,6 @@ module Sidekiq
                 #Unknown class
                 message_data.merge("queue"=>"default")
               end
-
           end
 
           #override queue if setted in config
@@ -518,7 +517,7 @@ module Sidekiq
       private
 
       def not_enqueued_after?(time)
-        @last_enqueue_time.nil? || @last_enqueue_time < last_time(time)
+        @last_enqueue_time.nil? || @last_enqueue_time.to_i < last_time(time).to_i
       end
 
       # Try parsing inbound args into an array.
@@ -544,7 +543,7 @@ module Sidekiq
 
       def not_past_scheduled_time?(current_time)
         last_cron_time = Rufus::Scheduler::CronLine.new(@cron).previous_time(current_time)
-        return false if (current_time - last_cron_time) > 60
+        return false if (current_time.to_i - last_cron_time.to_i) > 60
         true
       end
 

data/sidekiq-cron.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 0.4.4 ruby lib
+# stub: sidekiq-cron 0.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron".freeze
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/test/unit/job_test.rb

@@ -256,6 +256,30 @@ describe "Cron Job" do
     end
   end
 
+  describe '#sidekiq_worker_message settings overwrite queue name' do
+    before do
+      @args = {
+        name:  'Test',
+        cron:  '* * * * *',
+        queue: 'super_queue',
+        klass: 'CronTestClassWithQueue',
+        args:  { foo: 'bar' }
+      }
+      @job = Sidekiq::Cron::Job.new(@args)
+    end
+
+    it 'should return valid payload for Sidekiq::Client with overwrite queue name' do
+      payload = {
+        "retry" => false,
+        "backtrace"=>true,
+        "queue" => "super_queue",
+        "class" => "CronTestClassWithQueue",
+        "args"  => [{:foo=>"bar"}]
+      }
+      assert_equal @job.sidekiq_worker_message, payload
+    end
+  end
+
   describe '#active_job_message' do
     before do
       SecureRandom.stubs(:uuid).returns('XYZ')
@@ -911,5 +935,37 @@ describe "Cron Job" do
         assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after load"
       end
     end
+
+    describe "from array with queue_name" do
+      before do
+        @jobs_array = [
+          {
+            'name'  => 'name_of_job',
+            'class' => 'CronTestClassWithQueue',
+            'cron'  => '1 * * * *',
+            'args'  => '(OPTIONAL) [Array or Hash]',
+            'queue' => 'from_array'
+          }
+        ]
+      end
+
+      it "create new jobs and update old one with same settings" do
+        assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have 0 jobs before load"
+        out = Sidekiq::Cron::Job.load_from_array @jobs_array
+        assert_equal out.size, 0, "should have 0 error"
+        assert_equal Sidekiq::Cron::Job.all.size, 1, "Should have 2 jobs after load"
+
+        payload = {
+          "retry" => false,
+          "backtrace"=>true,
+          "queue" => "from_array",
+          "class" => "CronTestClassWithQueue",
+          "args"  => ['(OPTIONAL) [Array or Hash]']
+        }
+
+        assert_equal Sidekiq::Cron::Job.all.first.sidekiq_worker_message, payload
+      end
+
+    end
   end
 end

data/test/unit/web_extension_test.rb

@@ -24,6 +24,14 @@ describe 'Cron web' do
       klass: "CronTestClass"
     }
 
+
+    @cron_args = {
+      name: "TesQueueNameOfCronJob",
+      cron: "*/2 * * * *",
+      klass: "CronQueueTestClass",
+      queue: "cron"
+    }
+
   end
 
   it 'display cron web' do
@@ -38,6 +46,7 @@ describe 'Cron web' do
 
   it 'display cron web with cron jobs table' do
     Sidekiq::Cron::Job.create(@args)
+
     get '/cron'
     assert_equal 200, last_response.status
     refute last_response.body.include?('No cron jobs found')
@@ -51,6 +60,10 @@ describe 'Cron web' do
       @job = Sidekiq::Cron::Job.new(@args.merge(status: "enabled"))
       @job.save
       @name = "TestNameOfCronJob"
+
+      @cron_job = Sidekiq::Cron::Job.new(@cron_args.merge(status: "enabled"))
+      @cron_job.save
+      @cron_job_name = "TesQueueNameOfCronJob"
     end
 
     it "disable and enable cron job" do
@@ -78,11 +91,19 @@ describe 'Cron web' do
       Sidekiq.redis do |conn|
         assert_equal 2, conn.llen("queue:default"), "Queue should have 2 job"
       end
+
+      #should enqueue to cron job queue
+      post "/cron/#{@cron_job_name}/enque"
+
+      Sidekiq.redis do |conn|
+        assert_equal 1, conn.llen("queue:cron"), "Queue should have 1 cron job"
+      end
     end
 
     it "destroy job" do
-      assert_equal Sidekiq::Cron::Job.all.size, 1, "Should have 1 job"
+      assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 job"
       post "/cron/#{@name}/delete"
+      post "/cron/#{@cron_job_name}/delete"
       assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have zero jobs"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Ondrej Bartas
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sidekiq Cron helps to add repeated scheduled jobs