sidejob 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 033d179109658ea54b4b0bba545bc35a42fa48a1
-  data.tar.gz: f8a6688ab4fafadac1a053c5a3d1fa895b09e432
+  metadata.gz: b36b3196321a50ae889eb6e24e1ec4069264ed4b
+  data.tar.gz: 57428e567c0f471223f9cd3e537b1e4ec72a6a01
 SHA512:
-  metadata.gz: 2403991e7c3808512dfb86eeeaa0376e6709cdd8f30c6e739633b4e0486e72788b2aaf95fb8be7c29553c5be88269821ca4c495059ffc311d47aed1315f9ef9f
-  data.tar.gz: 85f8dc532fcde954b4504b756cf0f26827d714e4c62e59bad1b3ec75f859f79893dc2b468a9dfcc4f04e11622b53e75dfc26df1f9337cfe49dd45050a78425af
+  metadata.gz: 481b3a9fbb37768608bb8baa02a9422e3445bf7d5eb49c9d2bc5b486eb79303e59eb8c6581656044b1c94ee835b358640cdaca31b1d4ed851bf4c3aafea544ef
+  data.tar.gz: bd2447431aa6e568d5e7a7c931243f069477e711d334c1119154cd33e227f3efe7f533229f04f025bdbb953d87cd0808c0a9b683215aefabbc66aef928b6763c

data/lib/sidejob.rb

@@ -173,7 +173,6 @@ end
 # :nocov:
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.remove Sidekiq::Middleware::Server::RetryJobs # we never want sidekiq to retry jobs
     chain.add SideJob::ServerMiddleware
   end
 end

data/lib/sidejob/server_middleware.rb

@@ -15,6 +15,12 @@ module SideJob
     # @param msg [Hash] Sidekiq message format
     # @param queue [String] Queue the job was pulled from
     def call(worker, msg, queue)
+      # handle non SideJob workers (i.e. normal Sidekiq jobs)
+      unless worker.is_a?(SideJob::Worker)
+        yield
+        return
+      end
+
       @worker = worker
       return unless @worker.exists? # make sure the job has not been deleted
 

data/lib/sidejob/version.rb

@@ -1,4 +1,4 @@
 module SideJob
   # The current SideJob version
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 end

data/spec/sidejob/server_middleware_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
 describe SideJob::ServerMiddleware do
+  class TestSidekiqWorker
+    include Sidekiq::Worker
+    attr_accessor :data
+    def perform(data)
+      @data = data
+    end
+  end
+
   class TestWorkerStartup
     include SideJob::Worker
     register
@@ -239,4 +247,17 @@ describe SideJob::ServerMiddleware do
       expect(logged).to be true
     end
   end
+
+  it 'can run a non-SideJob job' do
+    msg = {'queue' => @queue, 'class' => 'TestSidekiqWorker', 'args' => [123]}
+    chain = Sidekiq::Middleware::Chain.new
+    chain.add SideJob::ServerMiddleware
+    worker = TestSidekiqWorker.new
+    expect(worker.data).not_to eq 123
+    chain.invoke(worker, msg, @queue) do
+      worker.perform(*msg['args'])
+      nil # test that we don't rely on return value being true
+    end
+    expect(worker.data).to eq 123
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidejob
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Austin Che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq