delayed_cron_job 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ec65c4ec0ca66d57f30457b6bf0327f43ee479
-  data.tar.gz: c311cfb9241e8145f324386833366b764cc73c1a
+  metadata.gz: 1a6855db526a23fa48933504b568fded11df2722
+  data.tar.gz: c28537792117c9937fb5deb5c18f287ebf90596f
 SHA512:
-  metadata.gz: 2d9b317975e2914d4ba8f3a6fd12981fccd9341d8432bd9508d6cdadf322f786fb0bb9cda5dd5015c9b053300ab3f1f5dc00ae88b568de9f22296dc416e1542a
-  data.tar.gz: 670ec7558441a32ede722f66c1821ee524498ee595fc9c03f230f1b313b9bdd3dabb58a7f8d883726a735b9007c4783635fdcad222b7234d8c6799e32b30a794
+  metadata.gz: 5abd5f9a6d32b08f7f92c274d355daaddebf32d9e93ec9197982c044c6a9928fc15a79a3412fa6c6589f98356d0183c768d20c6b8ad3cbbabd56bf256c2fa35c
+  data.tar.gz: 8abb91541f341a7e620ba2c602370e384b3093a0e6c4a7fd87ab0d6510c4610dc5be7dee8cdb562140320074805f3f1a0ff7c6d05969ca1ffe4c305087e60f09

data/.rspec

@@ -1,3 +1,2 @@
 --color
---warnings
 --require spec_helper

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+
+rvm:
+ - "2.3.0"
+
+sudo: false
+
+cache: bundler
+
+script: bundle exec rake

data/README.md

@@ -28,6 +28,10 @@ When enqueuing a job, simply pass the `cron` option, e.g.:
 
     Delayed::Job.enqueue(MyRepeatedJob.new, cron: '15 */6 * * 1-5')
 
+Or, when using Active Job:
+
+    MyJob.set(cron: '*/5 * * * *').perform_later
+
 Any crontab compatible cron expressions are supported (see `man 5 crontab`).
 The credits for the `Cronline` class used go to
 [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler).

data/delayed_cron_job.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "delayed_job_active_record"
+  spec.add_development_dependency "activejob"
+
 end

data/lib/delayed_cron_job.rb

@@ -18,3 +18,16 @@ if defined?(Delayed::Backend::ActiveRecord) && Delayed::Backend::ActiveRecord::J
 end
 
 Delayed::Worker.plugins << DelayedCronJob::Plugin
+
+if defined?(::ActiveJob)
+  require 'delayed_cron_job/active_job/enqueuing'
+  require 'delayed_cron_job/active_job/queue_adapter'
+
+  ActiveJob::Base.send(:include, DelayedCronJob::ActiveJob::Enqueuing)
+  if ActiveJob::QueueAdapters::DelayedJobAdapter.respond_to?(:enqueue)
+    ActiveJob::QueueAdapters::DelayedJobAdapter.extend(DelayedCronJob::ActiveJob::QueueAdapter)
+  else
+    ActiveJob::QueueAdapters::DelayedJobAdapter.send(:include, DelayedCronJob::ActiveJob::QueueAdapter)
+  end
+
+end

data/lib/delayed_cron_job/active_job/enqueuing.rb

@@ -0,0 +1,16 @@
+module DelayedCronJob
+  module ActiveJob
+    module Enqueuing
+
+      def self.included(klass)
+        klass.send(:attr_accessor, :cron)
+      end
+
+      def enqueue(options = {})
+        self.cron = options[:cron] if options[:cron]
+        super
+      end
+
+    end
+  end
+end

data/lib/delayed_cron_job/active_job/queue_adapter.rb

@@ -0,0 +1,33 @@
+module DelayedCronJob
+  module ActiveJob
+    module QueueAdapter
+
+      def self.included(klass)
+        klass.send(:alias_method, :enqueue, :enqueue_with_cron)
+        klass.send(:alias_method, :enqueue_at, :enqueue_at_with_cron)
+      end
+
+      def self.extended(klass)
+        meta = class << klass; self; end
+        meta.send(:alias_method, :enqueue, :enqueue_with_cron)
+        meta.send(:alias_method, :enqueue_at, :enqueue_at_with_cron)
+      end
+
+      def enqueue_with_cron(job)
+        enqueue_at(job, nil)
+      end
+
+      def enqueue_at_with_cron(job, timestamp)
+        options = { queue: job.queue_name,
+                    cron: job.cron  }
+        options[:run_at] = Time.at(timestamp) if timestamp
+        options[:priority] = job.priority if job.respond_to?(:priority)
+        wrapper = ::ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper.new(job.serialize)
+        delayed_job = Delayed::Job.enqueue(wrapper, options)
+        job.provider_job_id = delayed_job.id if job.respond_to?(:provider_job_id=)
+        delayed_job
+      end
+
+    end
+  end
+end

data/lib/delayed_cron_job/version.rb

@@ -1,3 +1,3 @@
 module DelayedCronJob
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/active_job_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe ActiveJob do
+
+  class CronJob < ActiveJob::Base
+    class_attribute :cron
+
+    def perform; end
+
+    def cron
+      @cron ||= self.class.cron
+    end
+  end
+
+  before { Delayed::Job.delete_all }
+
+  let(:cron)    { '5 1 * * *' }
+  let(:job)     { CronJob.set(cron: cron).perform_later }
+  let(:delayed_job) { Delayed::Job.first }
+  let(:worker)  { Delayed::Worker.new }
+  let(:now)     { Delayed::Job.db_time_now }
+  let(:next_run) do
+    run = now.hour * 60 + now.min >= 65 ? now + 1.day : now
+    Time.utc(run.year, run.month, run.day, 1, 5)
+  end
+
+  context 'with cron' do
+    it 'sets run_at on enqueue' do
+      expect { job }.to change { Delayed::Job.count }.by(1)
+      expect(delayed_job.run_at).to eq(next_run)
+      expect(delayed_job.cron).to eq(cron)
+    end
+
+    it 'schedules a new job after success' do
+      job
+      delayed_job.update_column(:run_at, now)
+      delayed_job.reload
+
+      worker.work_off
+
+      expect(Delayed::Job.count).to eq(1)
+      j = Delayed::Job.first
+      expect(j.id).to eq(delayed_job.id)
+      expect(j.cron).to eq(delayed_job.cron)
+      expect(j.run_at).to eq(next_run)
+      expect(j.attempts).to eq(1)
+      expect(j.last_error).to eq(nil)
+      expect(j.created_at).to eq(delayed_job.created_at)
+    end
+  end
+
+  context 'without cron' do
+    let(:job) { CronJob.perform_later }
+
+    it 'sets run_at but not cron on enqueue' do
+      CronJob.cron = nil
+      expect { job }.to change { Delayed::Job.count }.by(1)
+      expect(delayed_job.run_at).to be <= now
+      expect(delayed_job.cron).to be_nil
+    end
+
+    it 'uses default cron on enqueue' do
+      CronJob.cron = cron
+      expect { job }.to change { Delayed::Job.count }.by(1)
+      expect(delayed_job.run_at).to eq(next_run)
+      expect(delayed_job.cron).to eq(cron)
+    end
+  end
+end

data/spec/delayed_cron_job_spec.rb

@@ -1,4 +1,4 @@
-
+require 'spec_helper'
 
 describe DelayedCronJob do
 

data/spec/spec_helper.rb

@@ -15,11 +15,14 @@
 #
 
 require 'delayed_job_active_record'
+require 'active_job'
 require 'delayed_cron_job'
 
 Delayed::Worker.logger = Logger.new('/tmp/dj.log')
 ENV['RAILS_ENV'] = 'test'
 
+ActiveJob::Base.queue_adapter = :delayed_job
+
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
@@ -45,5 +48,5 @@ end
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_cron_job
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  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: |-
   Delayed Cron Job is an extension to Delayed::Job
                             that allows you to set cron expressions for your
@@ -106,17 +120,21 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - delayed_cron_job.gemspec
 - lib/delayed_cron_job.rb
+- lib/delayed_cron_job/active_job/enqueuing.rb
+- lib/delayed_cron_job/active_job/queue_adapter.rb
 - lib/delayed_cron_job/cronline.rb
 - lib/delayed_cron_job/plugin.rb
 - lib/delayed_cron_job/version.rb
 - lib/generators/delayed_job/cron_generator.rb
 - lib/generators/delayed_job/templates/cron_migration.rb
+- spec/active_job_spec.rb
 - spec/delayed_cron_job_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/codez/delayed_cron_job
@@ -145,5 +163,6 @@ specification_version: 4
 summary: An extension to Delayed::Job that allows you to set cron expressions for
   your jobs to run regularly.
 test_files:
+- spec/active_job_spec.rb
 - spec/delayed_cron_job_spec.rb
 - spec/spec_helper.rb