canvas-jobs 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce70c2ee3f74dfa74bfc81867ca03a9464d2b5a3
-  data.tar.gz: 0b0f5c9037bf93ad1c779ac74745fd5edfdaaa2c
+  metadata.gz: 09c716227c64b63dd68ab787a2af74a625f8da29
+  data.tar.gz: f7683091496f7afac5085bb7d38d0eac48a810ec
 SHA512:
-  metadata.gz: b2370e317be52bd5aa1654138c9d5eb45a8fd2764aa23901590a4c93c02522d1d6c8faaa1f6c43bf6a7c5e03e8c3b2d1b259efbd8a80238541400e469642e53b
-  data.tar.gz: 8e530206e099787a4c96b57792a74b4ed6a9fc231a8a03d55cf0b00b452384d7e5b0e680c2be0c500b255a8b87ef56d922d876a9fcfa03dc46d8a8bba3bae209
+  metadata.gz: 262577e7b68a7bfd44cea42e3d1cacffb0f6bf4caa4df7ac7c230f560bb11e4f333ff0c19688820c8ce7a675638bbb57eb45c7a3e869f2b0d075553c690c6b26
+  data.tar.gz: ef2c55f222a31b8a38069cb6177efe339251ed37690633a9f1dda4bded4df89de506169317da6ad2c1d3104b8a9c265c8d9432683b732b32dbec557d09bcb382

data/lib/delayed/backend/redis/job.rb

@@ -191,8 +191,6 @@ class Job
   end
 
   def self.reconnect!
-    self.redis ||= Redis.current
-
     # redis cluster responds to reconnect directly,
     # but individual redis needs it to be called on client
     redis.respond_to?(:reconnect) ?
@@ -457,7 +455,7 @@ class Job
       v = send(k)
       if v.nil?
         to_delete << k if !new_record? && changed.include?(k.to_s)
-      elsif v.is_a?(ActiveSupport::TimeWithZone)
+      elsif v.is_a?(ActiveSupport::TimeWithZone) || v.is_a?(Time)
         attrs[k] = v.utc.to_f
       else
         attrs[k] = v.as_json

data/lib/delayed/periodic.rb

@@ -75,7 +75,7 @@ class Periodic
   alias_method :display_name, :tag
 
   def self.now
-    Time.now
+    Time.zone.now
   end
 end
 end

data/lib/delayed/pool.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require 'optparse'
 require 'yaml'
 require 'fileutils'
@@ -21,10 +22,6 @@ class Pool
   end
 
   def run
-    if GC.respond_to?(:copy_on_write_friendly=)
-      GC.copy_on_write_friendly = true
-    end
-
     op = OptionParser.new do |opts|
       opts.banner = "Usage #{$0} <command> <options>"
       opts.separator %{\nWhere <command> is one of:
@@ -309,7 +306,7 @@ class Pool
   end
 
   def read_config(config_filename)
-    config = YAML.load_file(config_filename)
+    config = YAML.load(ERB.new(File.read(config_filename)).result)
     env = defined?(RAILS_ENV) ? RAILS_ENV : ENV['RAILS_ENV'] || 'development'
     @config = config[env] || config['default']
     # Backwards compatibility from when the config was just an array of queues

data/lib/delayed/testing.rb

@@ -0,0 +1,32 @@
+module Delayed
+module Testing
+  def self.run_job(job)
+    Delayed::Worker.new.perform(job)
+  end
+
+  def self.drain
+    while job = Delayed::Job.get_and_lock_next_available(
+        'spec run_jobs',
+        Delayed::Settings.queue,
+        0,
+        Delayed::MAX_PRIORITY)
+      run_job(job)
+    end
+  end
+
+  def self.track_created
+    job_tracking = JobTracking.track { yield }
+    job_tracking.created
+  end
+
+  def self.clear_all!
+    case Delayed::Job.name
+    when /Redis/
+      Delayed::Job.redis.flushdb
+    when /ActiveRecord/
+      Delayed::Job.delete_all
+      Delayed::Job::Failed.delete_all
+    end
+  end
+end
+end

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/active_record_job_spec.rb

@@ -10,8 +10,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
   end
 
   before do
-    Delayed::Job.delete_all
-    Delayed::Job::Failed.delete_all
+    Delayed::Testing.clear_all!
   end
 
   include_examples 'a delayed_jobs implementation'

data/spec/gemfiles/32.gemfile

@@ -4,3 +4,7 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 3.2.19"
 
+if RUBY_VERSION >= "2.0"
+  gem "syck"
+end
+

data/spec/gemfiles/32.gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.1)
+    canvas-jobs (0.9.3)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
       redis-scripting (= 1.0.1)
       rufus-scheduler (= 2.0.6)
-      syck
 
 GEM
   remote: https://rubygems.org/
@@ -135,6 +134,7 @@ DEPENDENCIES
   rails (~> 3.2.19)
   rake
   rspec
+  syck
   test_after_commit
   timecop
   wwtd

data/spec/gemfiles/40.gemfile

@@ -4,3 +4,6 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 4.0.10"
 
+if RUBY_VERSION >= "2.0"
+  gem "syck"
+end

data/spec/gemfiles/40.gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.1)
+    canvas-jobs (0.9.3)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
       redis-scripting (= 1.0.1)
       rufus-scheduler (= 2.0.6)
-      syck
 
 GEM
   remote: https://rubygems.org/
@@ -123,6 +122,7 @@ DEPENDENCIES
   rails (~> 4.0.10)
   rake
   rspec
+  syck
   test_after_commit
   timecop
   wwtd

data/spec/gemfiles/41.gemfile

@@ -4,3 +4,6 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 4.1.6"
 
+if RUBY_VERSION >= "2.0"
+  gem "syck"
+end

data/spec/gemfiles/41.gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.1)
+    canvas-jobs (0.9.3)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
       redis-scripting (= 1.0.1)
       rufus-scheduler (= 2.0.6)
-      syck
 
 GEM
   remote: https://rubygems.org/
@@ -129,6 +128,7 @@ DEPENDENCIES
   rails (~> 4.1.6)
   rake
   rspec
+  syck
   test_after_commit
   timecop
   wwtd

data/spec/gemfiles/42.gemfile

@@ -4,3 +4,6 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 4.2.0.beta2"
 
+if RUBY_VERSION >= "2.0"
+  gem "syck"
+end

data/spec/gemfiles/42.gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.1)
+    canvas-jobs (0.9.3)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
       redis-scripting (= 1.0.1)
       rufus-scheduler (= 2.0.6)
-      syck
 
 GEM
   remote: https://rubygems.org/
@@ -154,6 +153,7 @@ DEPENDENCIES
   rails (~> 4.2.0.beta2)
   rake
   rspec
+  syck
   test_after_commit
   timecop
   wwtd

data/spec/redis_job_spec.rb

@@ -10,7 +10,7 @@ describe 'Delayed::Backend::Redis::Job' do
   end
 
   before do
-    Delayed::Job.redis.flushdb
+    Delayed::Testing.clear_all!
   end
 
   include_examples 'a delayed_jobs implementation'

data/spec/shared/testing.rb

@@ -0,0 +1,47 @@
+shared_examples_for 'Delayed::Testing' do
+  class TestingWorker
+    cattr_accessor :runs
+
+    def self.run
+      self.runs += 1
+    end
+  end
+
+  before do
+    TestingWorker.runs = 0
+  end
+
+  describe '.run_job' do
+    it 'should run a single queued job' do
+      job = TestingWorker.send_later_enqueue_args(:run, no_delay: true)
+      Delayed::Testing.run_job(job)
+      expect(TestingWorker.runs).to eq 1
+    end
+  end
+
+  describe '.drain' do
+    it 'should run all queued jobs' do
+      3.times { TestingWorker.send_later(:run) }
+      Delayed::Testing.drain
+      expect(TestingWorker.runs).to eq 3
+    end
+  end
+
+  describe 'track_created' do
+    it 'should return the list of jobs created in the block' do
+      3.times { TestingWorker.send_later(:run) }
+      jobs = Delayed::Testing.track_created { 2.times { TestingWorker.send_later(:run) } }
+      expect(jobs.size).to eq 2
+      expect(jobs.first.tag).to eq "TestingWorker.run"
+    end
+  end
+
+  describe 'clear_all!' do
+    it 'should delete all queued jobs' do
+      3.times { TestingWorker.send_later(:run) }
+      Delayed::Testing.clear_all!
+      Delayed::Testing.drain
+      expect(TestingWorker.runs).to eq 0
+    end
+  end
+end

data/spec/shared_jobs_specs.rb

@@ -1,7 +1,8 @@
-require File.expand_path('../shared/shared_backend', __FILE__)
 require File.expand_path('../shared/delayed_batch', __FILE__)
 require File.expand_path('../shared/delayed_method', __FILE__)
 require File.expand_path('../shared/performable_method', __FILE__)
+require File.expand_path('../shared/shared_backend', __FILE__)
+require File.expand_path('../shared/testing', __FILE__)
 require File.expand_path('../shared/worker', __FILE__)
 
 shared_examples_for 'a delayed_jobs implementation' do
@@ -10,4 +11,5 @@ shared_examples_for 'a delayed_jobs implementation' do
   include_examples 'random ruby objects'
   include_examples 'Delayed::PerformableMethod'
   include_examples 'Delayed::Worker'
+  include_examples 'Delayed::Testing'
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'delayed_job'
+require 'delayed/testing'
 
 require 'database_cleaner'
 require 'test_after_commit'
@@ -45,6 +46,8 @@ ActiveRecord::Base.establish_connection({
 
 ActiveRecord::Migrator.migrate("db/migrate")
 ActiveRecord::Migrator.migrate("spec/migrate")
+Delayed::Backend::ActiveRecord::Job.reset_column_information
+Delayed::Backend::ActiveRecord::Job::Failed.reset_column_information
 
 Time.zone = 'UTC'
 Rails.logger = Logger.new(nil)
@@ -84,7 +87,7 @@ ensure
 end
 
 def run_job(job)
-  Delayed::Worker.new.perform(job)
+  Delayed::Testing.run_job(job)
 end
 
 require File.expand_path('../sample_jobs', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -254,6 +254,7 @@ files:
 - lib/delayed/periodic.rb
 - lib/delayed/pool.rb
 - lib/delayed/settings.rb
+- lib/delayed/testing.rb
 - lib/delayed/version.rb
 - lib/delayed/worker.rb
 - lib/delayed/yaml_extensions.rb
@@ -274,6 +275,7 @@ files:
 - spec/shared/delayed_method.rb
 - spec/shared/performable_method.rb
 - spec/shared/shared_backend.rb
+- spec/shared/testing.rb
 - spec/shared/worker.rb
 - spec/shared_jobs_specs.rb
 - spec/spec_helper.rb
@@ -317,6 +319,7 @@ test_files:
 - spec/shared/delayed_method.rb
 - spec/shared/performable_method.rb
 - spec/shared/shared_backend.rb
+- spec/shared/testing.rb
 - spec/shared/worker.rb
 - spec/shared_jobs_specs.rb
 - spec/spec_helper.rb