activejob-uniqueness 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576bc9d8d17789876b305414b48cdf74705ef4070e2c0a71fde10f4971bf8668
-  data.tar.gz: 3f07190b636fbb018476218cbdbb9d4de0867a7df25795dfee8d81af1f1cb190
+  metadata.gz: ff1cfb19bc51b7eb8f4040f700650c51a47376e1ec96c84ae72b764227911f0c
+  data.tar.gz: 3813cf68d80e7d56d828e15f179c677e49fe2f171780e25c0a6990b7b93eed76
 SHA512:
-  metadata.gz: 812b2dd96129d4ee015e1e2e456573e1c27c3a561df9229be27b652ccae70e94215b962b242790c4ea6f046ca99585853e38aee047f14fa23d96e76128b48add
-  data.tar.gz: 16cc9bc7a899ea72723854904027de0e49c12a2f62c72109bf182cf862735137dd6b2d41131c8b5a13a88f53d77d68137bb645e20fea1a8247dc5fae7e4f3b50
+  metadata.gz: b616c4460d8bffe1be31226c3d18d9d3a7197fd714d680ddd636b154934ff648fb5dface28b0099b59ac865a91a5a0cec85a8230ba8d442bda6f831535405b94
+  data.tar.gz: 938eb49268486827b8b946934838af755f7f449fc75e84f2cde8538e49af7e786edc13583a715ad86b2203a58867e324e8e580cc611d522e512ae7ed235ddae1

data/.travis.yml

@@ -12,6 +12,7 @@ env:
   - ACTIVEJOB_VERSION="~> 4.2.11"
   - ACTIVEJOB_VERSION="~> 5.2.4"
   - ACTIVEJOB_VERSION="~> 6.0.3"
+  - ACTIVEJOB_VERSION="~> 6.0.3" SIDEKIQ_VERSION="~> 6.0.0"
 jobs:
   exclude:
     - rvm: 2.7.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Changes Between 0.1.1 and 0.1.2
+
+Release lock for Sidekiq adapter when all Sidekiq attempts were unsuccessful or job is deleted manually from Sidekiq::Web
+[PR](https://github.com/veeqo/activejob-uniqueness/pull/5) by @vbyno
+
 ## Changes Between 0.1.0 and 0.1.1
 
 Fixed NoMethodError on `Rails.application.eager_load!` in Rails initializer

data/Gemfile

@@ -8,3 +8,8 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'activejob', ENV.fetch('ACTIVEJOB_VERSION', '~> 4.2.11')
+
+if ENV['SIDEKIQ_VERSION']
+  gem 'sidekiq', ENV.fetch('SIDEKIQ_VERSION')
+  gem 'railties', ENV.fetch('ACTIVEJOB_VERSION')
+end

data/lib/active_job/uniqueness/patch.rb

@@ -74,6 +74,11 @@ module ActiveJob
 
     ActiveSupport.on_load(:active_job) do
       ActiveJob::Base.include ActiveJob::Uniqueness::Patch
+
+      if ::ActiveJob.const_defined?(:Railtie) &&
+         ActiveJob::Railtie.config.active_job.queue_adapter.to_sym == :sidekiq
+        require_relative 'patch/sidekiq'
+      end
     end
   end
 end

data/lib/active_job/uniqueness/patch/sidekiq.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module ActiveJob
+  module Uniqueness
+    module Patch
+      def self.delete_sidekiq_job!(job)
+        ActiveJob::Uniqueness.unlock!(
+          job_class_name: job.fetch('wrapped'),
+          arguments: job.fetch('args').first.fetch('arguments')
+        )
+      end
+    end
+  end
+end
+
+require 'sidekiq/api'
+
+Sidekiq.configure_server do |config|
+  config.death_handlers << ->(job, _ex) do
+    ActiveJob::Uniqueness::Patch.delete_sidekiq_job!(job)
+  end
+end
+
+module Sidekiq
+  class SortedEntry
+    module UniqueExtension
+      def delete
+        ActiveJob::Uniqueness::Patch.delete_sidekiq_job!(item) if super
+        item
+      end
+
+      private
+
+      def remove_job
+        super do |message|
+          ActiveJob::Uniqueness::Patch.delete_sidekiq_job!(Sidekiq.load_json(message))
+          yield message
+        end
+      end
+    end
+
+    prepend UniqueExtension
+  end
+
+  class ScheduledSet
+    module UniqueExtension
+      def delete(score, job_id)
+        entry = find_job(job_id)
+        ActiveJob::Uniqueness::Patch.delete_sidekiq_job!(entry.item) if super(score, job_id)
+        entry
+      end
+    end
+
+    prepend UniqueExtension
+  end
+
+  class Job
+    module UniqueExtension
+      def delete
+        ActiveJob::Uniqueness::Patch.delete_sidekiq_job!(item)
+        super
+      end
+    end
+
+    prepend UniqueExtension
+  end
+
+  class Queue
+    module UniqueExtension
+      def clear
+        each(&:delete)
+        super
+      end
+    end
+
+    prepend UniqueExtension
+  end
+
+  class JobSet
+    module UniqueExtension
+      def clear
+        each(&:delete)
+        super
+      end
+
+      def delete_by_value(name, value)
+        ActiveJob::Uniqueness::Patch.delete_sidekiq_job!(Sidekiq.load_json(value)) if super(name, value)
+      end
+    end
+
+    prepend UniqueExtension
+  end
+end

data/lib/active_job/uniqueness/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveJob
   module Uniqueness
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-uniqueness
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rustam Sharshenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -124,6 +124,7 @@ files:
 - lib/active_job/uniqueness/lock_manager.rb
 - lib/active_job/uniqueness/log_subscriber.rb
 - lib/active_job/uniqueness/patch.rb
+- lib/active_job/uniqueness/patch/sidekiq.rb
 - lib/active_job/uniqueness/strategies.rb
 - lib/active_job/uniqueness/strategies/base.rb
 - lib/active_job/uniqueness/strategies/until_and_while_executing.rb