canvas-jobs 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad93c34959f9fd5742ab07582c6708cb6701febe
-  data.tar.gz: e10385f439aa7f34293c545b6bb3a094a645b0ba
+  metadata.gz: ad6300227d1380ed20717f92ebd1d628295685b4
+  data.tar.gz: 6b18acd99fb06b30edcb80ed90fbf117f5f3eab6
 SHA512:
-  metadata.gz: b02c7e200b1e9b4e337cdecee326cc49652299bea939fa74fba97ac62c010b2a97d3289a5db048349a4ad09d992070f368a9785203bf15755565394e81d7d579
-  data.tar.gz: d24c55eef5e03eed2398062c9e16fb850b8cec4344011aeeebc64ffc8bca400b4f444b8a7b3fc7477591f8a97fd01596dffd7072671f3e054d4c9e04bc746df7
+  metadata.gz: e902946c32dcb6ea0be687066837cc94254714df18e9e7a562e2308d563a24382b300990ef1f59d4c9d1c1b6145984a2c7d0d72d7e967ef4e72516a8bc78a0c6
+  data.tar.gz: ebf19119b6be32e917de452611ca1f73b555cfb76616a4caa6c09f0db709afe7059ba2bb26e1beb2ac1819d966be41869f0d8a9bc75931a7910c1d69997b582b

data/lib/delayed/backend/base.rb

@@ -219,12 +219,14 @@ module Delayed
 
       # Moved into its own method so that new_relic can trace it.
       def invoke_job
-        Delayed::Job.in_delayed_job = true
-        begin
-          payload_object.perform
-        ensure
-          Delayed::Job.in_delayed_job = false
-          ::ActiveRecord::Base.clear_active_connections! unless Rails.env.test?
+        Delayed::Worker.lifecycle.run_callbacks(:invoke_job, self) do
+          Delayed::Job.in_delayed_job = true
+          begin
+            payload_object.perform
+          ensure
+            Delayed::Job.in_delayed_job = false
+            ::ActiveRecord::Base.clear_active_connections! unless Rails.env.test?
+          end
         end
       end
 

data/lib/delayed/lifecycle.rb

@@ -6,6 +6,7 @@ module Delayed
       :perform          => [:worker, :job],
       :pop              => [:worker],
       :exceptional_exit => [:worker, :exception],
+      :invoke_job       => [:job],
     }
 
     def initialize
@@ -14,6 +15,7 @@ module Delayed
 
     def reset!
       @callbacks = EVENTS.keys.inject({}) { |hash, e| hash[e] = Callback.new; hash }
+      Delayed::Worker.plugins.each { |plugin| plugin.reset! }
     end
 
     def before(event, &block)

data/lib/delayed/plugin.rb

@@ -0,0 +1,22 @@
+require 'active_support/core_ext/class/attribute'
+
+module Delayed
+  class Plugin
+    class_attribute :callback_block
+
+    def self.callbacks(&block)
+      self.callback_block = block
+    end
+
+    def self.inject!
+      unless @injected
+        self.callback_block.call(Delayed::Worker.lifecycle) if self.callback_block
+      end
+      @injected = true
+    end
+
+    def self.reset!
+      @injected = false
+    end
+  end
+end

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/lib/delayed/worker.rb

@@ -3,6 +3,7 @@ module Delayed
 class TimeoutError < RuntimeError; end
 
 require 'tmpdir'
+require 'set'
 
 class Worker
   attr_reader :config, :queue, :min_priority, :max_priority
@@ -20,6 +21,9 @@ class Worker
   end
   cattr_reader :on_max_failures
 
+  cattr_accessor :plugins
+  self.plugins = Set.new
+
   def self.lifecycle
     @lifecycle ||= Delayed::Lifecycle.new
   end
@@ -47,6 +51,8 @@ class Worker
         end
       end
     end
+
+    plugins.each { |plugin| plugin.inject! }
   end
 
   def name=(name)

data/lib/delayed_job.rb

@@ -29,6 +29,7 @@ require 'delayed/lifecycle'
 require 'delayed/message_sending'
 require 'delayed/performable_method'
 require 'delayed/periodic'
+require 'delayed/plugin'
 require 'delayed/pool'
 require 'delayed/worker'
 

data/spec/gemfiles/32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.8)
+    canvas-jobs (0.9.9)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)

data/spec/gemfiles/40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.8)
+    canvas-jobs (0.9.9)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)

data/spec/gemfiles/41.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.8)
+    canvas-jobs (0.9.9)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)

data/spec/gemfiles/42.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.8)
+    canvas-jobs (0.9.9)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
@@ -130,6 +130,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (~> 2.8)
+    syck (1.0.4)
     test_after_commit (0.3.0)
       activerecord (>= 3.2)
     thor (0.19.1)
@@ -152,6 +153,7 @@ DEPENDENCIES
   rails (~> 4.2.0.beta2)
   rake
   rspec
+  syck
   test_after_commit
   timecop
   wwtd

data/spec/shared/worker.rb

@@ -288,4 +288,27 @@ shared_examples_for 'Delayed::Worker' do
       worker.queue.should == queue_name
     end
   end
+
+  context "plugins" do
+    class TestPlugin < ::Delayed::Plugin
+      cattr_accessor :runs
+      self.runs = 0
+      callbacks do |lifecycle|
+        lifecycle.around(:invoke_job) do |job, *args, &block|
+          TestPlugin.runs += 1
+          block.call(job, *args)
+        end
+      end
+    end
+
+    it "should create and call the plugin callbacks" do
+      TestPlugin.runs = 0
+      Delayed::Worker.plugins << TestPlugin
+      job_create
+      @worker = Delayed::Worker.new(:quiet => true)
+      @worker.run
+      expect(TestPlugin.runs).to eq(1)
+      expect(SimpleJob.runs).to eq(1)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -254,6 +254,7 @@ files:
 - lib/delayed/message_sending.rb
 - lib/delayed/performable_method.rb
 - lib/delayed/periodic.rb
+- lib/delayed/plugin.rb
 - lib/delayed/pool.rb
 - lib/delayed/settings.rb
 - lib/delayed/testing.rb
@@ -300,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -325,3 +326,4 @@ test_files:
 - spec/shared/worker.rb
 - spec/shared_jobs_specs.rb
 - spec/spec_helper.rb
+has_rdoc: