scheduled_job 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 086a464af16592accd6f73697f08b201e69ce287
-  data.tar.gz: 5a0fedb421b68e80b681f8aa5ec705797a50c2c0
+  metadata.gz: 30677ced04a460d65fe090c92f6bf5b914d85d07
+  data.tar.gz: 8d5ecd3dbc01fcc33c52663d24123943192998a2
 SHA512:
-  metadata.gz: deff4169d776644f323bfec2d8acb0b4eb48323ecae3eb251048dad15d0b01af40c188126eb0d500b26a9ebdb1f4ea0b2845eea467203ab7ac4b9b8f0d7b7200
-  data.tar.gz: 4b8e46bcddb661417a76562c79e65e8c054f0e206bdf094d26cc7edc6dddae5cc10f8e8dba36056b26c76205e580dff99bbe3372d97e2da814b7aec16343f517
+  metadata.gz: 746edac4b4b6c72f2281f7fe7fcc6d86d383867e398f43c54b03f0f92712cd4f0b907237dfae32d94157c8490bc276271ead90bae7d663a07e446561817028f2
+  data.tar.gz: 3ab1ba959f72642680b83b7c80b4e061a9f94efe38f445596789461a2a1523083b56d7a6267b4f8b7099c13fc079238cb3d7e7a481c9fb2703e684d6b069ddac

data/CHANGELOG.md

@@ -35,3 +35,6 @@ This is needed is some cases where scheduled_job is deployed in a container and
 
 # 0.2.3
 Updating the acitve* gem dependency versions to support the current release. Also drops travis testing for ruby 1.9.3 which is no longer an officially supported Ruby version.
+
+# 0.2.4
+Updates the way that we detect if an instance of a job has already been scheduled. This was because we were incorrectly seeing a delayed method as an instance of that job already being scheduled.

data/lib/scheduled_job/version.rb

@@ -1,3 +1,3 @@
 module ScheduledJob
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/scheduled_job.rb

@@ -97,12 +97,17 @@ module ScheduledJob
     end
 
     def can_schedule_job?(job = nil)
-      conditions = ['(handler like ? OR handler like ?) AND failed_at IS NULL', "%:#{self.name} %", "%:#{self.name}\n%"]
+      conditions = 'failed_at IS NULL'
       unless job.blank?
-        conditions[0] << " AND id != ?"
+        conditions << " AND id != "
         conditions << job.id
       end
-      job_count = Delayed::Job.where(conditions).count
+      jobs = Delayed::Job.where(conditions).find_all do |dj|
+        dj.handler.split[1][/(?<=:)[A-Z][A-z0-9:]+/] == self.name
+      end
+
+      job_count = jobs.count
+
       intended_job_count = 1
 
       if ScheduledJob.config.jobs && ScheduledJob.config.jobs[self.name]

data/spec/lib/scheduled_job_spec.rb

@@ -20,7 +20,10 @@ class Test < UnderTest
 end
 
 describe ScheduledJob do
-  before { ScheduledJob.configure { |config| config.jobs = nil } }
+  before do
+    ScheduledJob.configure { |config| config.jobs = nil }
+    Delayed::Job.delete_all
+  end
 
   let(:under_test) { UnderTest.new }
 
@@ -195,6 +198,12 @@ describe ScheduledJob do
     UnderTest.schedule_job job
   end
 
+  it 'doesnt find delayed methods as existing' do
+    UnderTest.delay.queue_name
+    UnderTest.schedule_job
+    expect(Delayed::Job.count).to eq(2)
+  end
+
   it 'doesnt find substring jobs as existing' do
     UnderTest.schedule_job
     Test.schedule_job

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scheduled_job
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - CallumD
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job