sidekiq-unique-jobs 7.1.8 → 8.0.3

data/lib/sidekiq_unique_jobs/web/views/lock.erb

@@ -7,9 +7,11 @@
   <div class="col-sm-7 table-responsive">
     <% if @lock.info.none? %>
     <h3>No Lock Information Available</h3>
-    <p>To use it turn the following setting on:
-      <code>SidekiqUniqueJobs.config.lock_info = true</code>
-    </p>
+    <% unless SidekiqUniqueJobs.config.lock_info %>
+      <p>To use it turn the following setting on:
+        <code>SidekiqUniqueJobs.config.lock_info = true</code>
+      </p>
+    <% end %>
     <% else %>
     <table class="table table-striped table-bordered table-white table-hover">
       <caption>Information about lock</caption>

data/lib/sidekiq_unique_jobs/web/views/locks.erb

@@ -7,48 +7,53 @@
   <form action="<%= root_path %>locks" class="form form-inline" method="get">
     <%= csrf_tag %>
     <input name="filter" class="form-control" type="text" value="<%= @filter %>" />
+
     <button class="btn btn-default" type="submit">
-    <%= t('Filter') %>
+      <%= t('Filter') %>
     </button>
+
   </form>
+
   <% if @locks.any? && @total_size > @count %>
-  <div class="col-sm-4">
-    <%= erb unique_template(:_paging), locals: { url: "#{root_path}locks" } %>
-  </div>
+    <div class="col-sm-4">
+      <%= erb unique_template(:_paging), locals: { url: "#{root_path}locks" } %>
+    </div>
   <% end %>
 </header>
+
 <% if @locks.any? %>
-<div class="table_container">
-  <table class="table table-striped table-bordered table-hover">
-    <thead>
-      <tr>
-        <th><%= t('Delete') %></th>
-        <th><%= t('Digest') %></th>
-        <th><%= t('Lock') %></th>
-        <th><%= t('Locks') %></th>
-        <th><%= t('Since') %></th>
-      </tr>
-    </thead>
-    <% @locks.each do |lock| %>
-    <tbody>
-      <tr class="lock-row">
-        <td>
-          <form action="<%= root_path %>locks/<%= lock.key %>/delete" method="get">
-            <%= csrf_tag %>
-            <input name="lock" value="<%= h lock.key %>" type="hidden" />
-            <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
-          </form>
-        </td>
-        <td><a href="<%= root_path %>locks/<%= lock.key %>"><%= lock.key %></a></td>
-        <td><%= lock.info["lock"] %></td>
-        <td><%= lock.locked.count %></td>
-        <td><%= safe_relative_time(lock.created_at) %></td>
-      </tr>
-    </tbody>
-    <% end %>
-</table>
-<form action="<%= root_path %>locks/delete_all" method="get">
-  <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-</form>
-</div>
+  <div class="table_container">
+    <table class="table table-striped table-bordered table-hover">
+      <thead>
+        <tr>
+          <th><%= t('Delete') %></th>
+          <th><%= t('Digest') %></th>
+          <th><%= t('Lock') %></th>
+          <th><%= t('Locks') %></th>
+          <th><%= t('Since') %></th>
+        </tr>
+      </thead>
+      <% @locks.each do |lock| %>
+        <tbody>
+          <tr class="lock-row">
+            <td>
+              <form action="<%= root_path %>locks/<%= lock.key %>/delete" method="get">
+                <%= csrf_tag %>
+                <input name="lock" value="<%= h lock.key %>" type="hidden" />
+                <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
+              </form>
+            </td>
+            <td><a href="<%= root_path %>locks/<%= lock.key %>"><%= lock.key %></a></td>
+            <td><%= lock.info["lock"] %></td>
+            <td><%= lock.locked.count %></td>
+            <td><%= safe_relative_time(lock.created_at) %></td>
+          </tr>
+        </tbody>
+      <% end %>
+    </table>
+
+    <form action="<%= root_path %>locks/delete_all" method="get">
+      <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+  </div>
 <% end %>

data/lib/sidekiq_unique_jobs/web.rb

@@ -5,10 +5,9 @@ require_relative "web/helpers"
 module SidekiqUniqueJobs
   # Utility module to help manage unique keys in redis.
   # Useful for deleting keys that for whatever reason wasn't deleted
-  #
   # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Web
-    def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       app.helpers do
         include Web::Helpers
       end
@@ -17,8 +16,8 @@ module SidekiqUniqueJobs
         @filter         = params[:filter] || "*"
         @filter         = "*" if @filter == ""
         @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor]
-        @prev_cursor    = params[:prev_cursor]
+        @current_cursor = params[:cursor].to_i
+        @prev_cursor    = params[:prev_cursor].to_i
         @total_size, @next_cursor, @changelogs = changelog.page(
           cursor: @current_cursor,
           pattern: @filter,
@@ -37,8 +36,8 @@ module SidekiqUniqueJobs
         @filter         = params[:filter] || "*"
         @filter         = "*" if @filter == ""
         @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor]
-        @prev_cursor    = params[:prev_cursor]
+        @current_cursor = params[:cursor].to_i
+        @prev_cursor    = params[:prev_cursor].to_i
 
         @total_size, @next_cursor, @locks = digests.page(
           cursor: @current_cursor,
@@ -49,8 +48,25 @@ module SidekiqUniqueJobs
         erb(unique_template(:locks))
       end
 
+      app.get "/expiring_locks" do
+        @filter         = params[:filter] || "*"
+        @filter         = "*" if @filter == ""
+        @count          = (params[:count] || 100).to_i
+        @current_cursor = params[:cursor].to_i
+        @prev_cursor    = params[:prev_cursor].to_i
+
+        @total_size, @next_cursor, @locks = expiring_digests.page(
+          cursor: @current_cursor,
+          pattern: @filter,
+          page_size: @count,
+        )
+
+        erb(unique_template(:locks))
+      end
+
       app.get "/locks/delete_all" do
         digests.delete_by_pattern("*", count: digests.count)
+        expiring_digests.delete_by_pattern("*", count: digests.count)
         redirect_to :locks
       end
 
@@ -63,6 +79,7 @@ module SidekiqUniqueJobs
 
       app.get "/locks/:digest/delete" do
         digests.delete_by_digest(params[:digest])
+        expiring_digests.delete_by_digest(params[:digest])
         redirect_to :locks
       end
 
@@ -82,8 +99,9 @@ begin
   require "sidekiq/web" unless defined?(Sidekiq::Web)
 
   Sidekiq::Web.register(SidekiqUniqueJobs::Web)
-  Sidekiq::Web.tabs["Locks"]      = "locks"
-  Sidekiq::Web.tabs["Changelogs"] = "changelogs"
+  Sidekiq::Web.tabs["Locks"]          = "locks"
+  Sidekiq::Web.tabs["Expiring Locks"] = "expiring_locks"
+  Sidekiq::Web.tabs["Changelogs"]     = "changelogs"
   Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "locales")
 rescue NameError, LoadError => ex
   SidekiqUniqueJobs.logger.error(ex)

data/lib/sidekiq_unique_jobs.rb

@@ -49,6 +49,7 @@ require "sidekiq_unique_jobs/cli"
 require "sidekiq_unique_jobs/core_ext"
 require "sidekiq_unique_jobs/lock_timeout"
 require "sidekiq_unique_jobs/lock_ttl"
+require "sidekiq_unique_jobs/lock_type"
 require "sidekiq_unique_jobs/lock_args"
 require "sidekiq_unique_jobs/lock_digest"
 require "sidekiq_unique_jobs/unlockable"
@@ -72,6 +73,7 @@ require "sidekiq_unique_jobs/sidekiq_unique_ext"
 require "sidekiq_unique_jobs/on_conflict"
 require "sidekiq_unique_jobs/changelog"
 require "sidekiq_unique_jobs/digests"
+require "sidekiq_unique_jobs/expiring_digests"
 
 require "sidekiq_unique_jobs/config"
 require "sidekiq_unique_jobs/sidekiq_unique_jobs"

data/lib/tasks/changelog.rake

@@ -17,7 +17,7 @@ COMMIT_CHANGELOG_CMD = "git commit -a -m 'Update changelog'"
 desc "Generate a Changelog"
 task :changelog do
   sh("git checkout main")
-  sh(*CHANGELOG_CMD.push(ENV["CHANGELOG_GITHUB_TOKEN"]))
+  sh(*CHANGELOG_CMD.push(ENV.fetch("CHANGELOG_GITHUB_TOKEN", nil)))
   sh(ADD_CHANGELOG_CMD)
   sh(COMMIT_CHANGELOG_CMD)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.1.8
+  version: 8.0.3
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -56,27 +56,27 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -116,6 +116,7 @@ files:
 - lib/sidekiq_unique_jobs/deprecation.rb
 - lib/sidekiq_unique_jobs/digests.rb
 - lib/sidekiq_unique_jobs/exceptions.rb
+- lib/sidekiq_unique_jobs/expiring_digests.rb
 - lib/sidekiq_unique_jobs/job.rb
 - lib/sidekiq_unique_jobs/json.rb
 - lib/sidekiq_unique_jobs/key.rb
@@ -136,6 +137,7 @@ files:
 - lib/sidekiq_unique_jobs/lock_info.rb
 - lib/sidekiq_unique_jobs/lock_timeout.rb
 - lib/sidekiq_unique_jobs/lock_ttl.rb
+- lib/sidekiq_unique_jobs/lock_type.rb
 - lib/sidekiq_unique_jobs/locksmith.rb
 - lib/sidekiq_unique_jobs/logging.rb
 - lib/sidekiq_unique_jobs/logging/middleware_context.rb
@@ -144,6 +146,7 @@ files:
 - lib/sidekiq_unique_jobs/lua/delete_job_by_digest.lua
 - lib/sidekiq_unique_jobs/lua/find_digest_in_queues.lua
 - lib/sidekiq_unique_jobs/lua/lock.lua
+- lib/sidekiq_unique_jobs/lua/lock_until_expired.lua
 - lib/sidekiq_unique_jobs/lua/locked.lua
 - lib/sidekiq_unique_jobs/lua/queue.lua
 - lib/sidekiq_unique_jobs/lua/reap_orphans.lua
@@ -211,42 +214,12 @@ files:
 - lib/sidekiq_unique_jobs/web/views/lock.erb
 - lib/sidekiq_unique_jobs/web/views/locks.erb
 - lib/tasks/changelog.rake
-homepage: https://mhenrixon.github.io/sidekiq-unique-jobs
+homepage: https://github.com/mhenrixon/sidekiq-unique-jobs
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://mhenrixon.github.io/sidekiq-unique-jobs
-  bug_tracker_uri: https://github.com/mhenrixon/sidekiq-unique-jobs/issues
-  documentation_uri: https://mhenrixon.github.io/sidekiq-unique-jobs
-  source_code_uri: https://github.com/mhenrixon/sidekiq-unique-jobs
-  changelog_uri: https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md
-post_install_message: |
-  IMPORTANT!
-
-  Automatic configuration of the sidekiq middleware is no longer done.
-  Please see: https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/README.md#add-the-middleware
-
-  This version deprecated the following sidekiq_options
-
-    - sidekiq_options lock_args: :method_name
-
-  It is now configured with:
-
-    - sidekiq_options lock_args_method: :method_name
-
-  This is also true for `Sidekiq.default_worker_options`
-
-  We also deprecated the global configuration options:
-    - default_lock_ttl
-    - default_lock_ttl=
-    - default_lock_timeout
-    - default_lock_timeout=
-
-  The new methods to use are:
-    - lock_ttl
-    - lock_ttl=
-    - lock_timeout
-    - lock_timeout=
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -254,14 +227,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs