sidekiq-unique-jobs 6.0.24 → 7.0.4

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

@@ -0,0 +1,52 @@
+<header class="row">
+  <div class="col-sm-5">
+    <h3>
+    <%= t('Locks') %>
+    </h3>
+  </div>
+  <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') %>
+    </button>
+  </form>
+  <% if @locks.any? && @total_size > @count.to_i %>
+  <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| %>
+    <tr>
+      <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"] %></th>
+    <td><%= lock.locked.count %></td>
+    <td><%= safe_relative_time(lock.created_at) %></td>
+  </tr>
+  <% 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/tasks/changelog.rake

@@ -5,15 +5,15 @@ task :changelog do
   # rubocop:disable Style/MutableConstant
   CHANGELOG_CMD ||= %w[
     github_changelog_generator
-    -u
+    --no-verbose
+    --user
     mhenrixon
-    -p
+    --project
     sidekiq-unique-jobs
-    --no-verbose
     --token
   ]
-  ADD_CHANGELOG_CMD      ||= "git add --all"
-  COMMIT_CHANGELOG_CMD   ||= "git commit -a -m 'Update changelog'"
+  ADD_CHANGELOG_CMD ||= "git add --all"
+  COMMIT_CHANGELOG_CMD ||= "git commit -a -m 'Update changelog'"
   # rubocop:enable Style/MutableConstant
 
   sh("git checkout master")

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.24
+  version: 7.0.4
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-27 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: brpoplpush-redis_script
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -36,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -46,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -70,158 +90,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.18
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.18
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: |
   Prevents simultaneous Sidekiq jobs with the same unique arguments to run.
   Highly configurable to suite your specific needs.
@@ -238,24 +106,61 @@ files:
 - bin/uniquejobs
 - lib/sidekiq-unique-jobs.rb
 - lib/sidekiq_unique_jobs.rb
+- lib/sidekiq_unique_jobs/batch_delete.rb
+- lib/sidekiq_unique_jobs/changelog.rb
 - lib/sidekiq_unique_jobs/cli.rb
-- lib/sidekiq_unique_jobs/client/middleware.rb
+- lib/sidekiq_unique_jobs/config.rb
 - lib/sidekiq_unique_jobs/connection.rb
 - lib/sidekiq_unique_jobs/constants.rb
 - lib/sidekiq_unique_jobs/core_ext.rb
 - lib/sidekiq_unique_jobs/digests.rb
 - lib/sidekiq_unique_jobs/exceptions.rb
 - lib/sidekiq_unique_jobs/job.rb
+- lib/sidekiq_unique_jobs/json.rb
+- lib/sidekiq_unique_jobs/key.rb
+- lib/sidekiq_unique_jobs/lock.rb
 - lib/sidekiq_unique_jobs/lock/base_lock.rb
+- lib/sidekiq_unique_jobs/lock/client_validator.rb
+- lib/sidekiq_unique_jobs/lock/server_validator.rb
 - lib/sidekiq_unique_jobs/lock/until_and_while_executing.rb
 - lib/sidekiq_unique_jobs/lock/until_executed.rb
 - lib/sidekiq_unique_jobs/lock/until_executing.rb
 - lib/sidekiq_unique_jobs/lock/until_expired.rb
+- lib/sidekiq_unique_jobs/lock/validator.rb
 - lib/sidekiq_unique_jobs/lock/while_executing.rb
 - lib/sidekiq_unique_jobs/lock/while_executing_reject.rb
+- lib/sidekiq_unique_jobs/lock_args.rb
+- lib/sidekiq_unique_jobs/lock_config.rb
+- lib/sidekiq_unique_jobs/lock_digest.rb
+- 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/locksmith.rb
 - lib/sidekiq_unique_jobs/logging.rb
+- lib/sidekiq_unique_jobs/logging/middleware_context.rb
+- lib/sidekiq_unique_jobs/lua/delete.lua
+- lib/sidekiq_unique_jobs/lua/delete_by_digest.lua
+- 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/locked.lua
+- lib/sidekiq_unique_jobs/lua/queue.lua
+- lib/sidekiq_unique_jobs/lua/reap_orphans.lua
+- lib/sidekiq_unique_jobs/lua/shared/_common.lua
+- lib/sidekiq_unique_jobs/lua/shared/_current_time.lua
+- lib/sidekiq_unique_jobs/lua/shared/_delete_from_queue.lua
+- lib/sidekiq_unique_jobs/lua/shared/_delete_from_sorted_set.lua
+- lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_process_set.lua
+- lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_queues.lua
+- lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_sorted_set.lua
+- lib/sidekiq_unique_jobs/lua/shared/_hgetall.lua
+- lib/sidekiq_unique_jobs/lua/shared/_upgrades.lua
+- lib/sidekiq_unique_jobs/lua/unlock.lua
+- lib/sidekiq_unique_jobs/lua/update_version.lua
+- lib/sidekiq_unique_jobs/lua/upgrade.lua
 - lib/sidekiq_unique_jobs/middleware.rb
+- lib/sidekiq_unique_jobs/middleware/client.rb
+- lib/sidekiq_unique_jobs/middleware/server.rb
 - lib/sidekiq_unique_jobs/normalizer.rb
 - lib/sidekiq_unique_jobs/on_conflict.rb
 - lib/sidekiq_unique_jobs/on_conflict/log.rb
@@ -266,33 +171,42 @@ files:
 - lib/sidekiq_unique_jobs/on_conflict/reschedule.rb
 - lib/sidekiq_unique_jobs/on_conflict/strategy.rb
 - lib/sidekiq_unique_jobs/options_with_fallback.rb
-- lib/sidekiq_unique_jobs/scripts.rb
-- lib/sidekiq_unique_jobs/server/middleware.rb
+- lib/sidekiq_unique_jobs/orphans/lua_reaper.rb
+- lib/sidekiq_unique_jobs/orphans/manager.rb
+- lib/sidekiq_unique_jobs/orphans/null_reaper.rb
+- lib/sidekiq_unique_jobs/orphans/observer.rb
+- lib/sidekiq_unique_jobs/orphans/reaper.rb
+- lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb
+- lib/sidekiq_unique_jobs/redis.rb
+- lib/sidekiq_unique_jobs/redis/entity.rb
+- lib/sidekiq_unique_jobs/redis/hash.rb
+- lib/sidekiq_unique_jobs/redis/list.rb
+- lib/sidekiq_unique_jobs/redis/set.rb
+- lib/sidekiq_unique_jobs/redis/sorted_set.rb
+- lib/sidekiq_unique_jobs/redis/string.rb
+- lib/sidekiq_unique_jobs/rspec/matchers.rb
+- lib/sidekiq_unique_jobs/rspec/matchers/have_valid_sidekiq_options.rb
+- lib/sidekiq_unique_jobs/script.rb
+- lib/sidekiq_unique_jobs/script/caller.rb
+- lib/sidekiq_unique_jobs/server.rb
 - lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb
 - lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb
 - lib/sidekiq_unique_jobs/sidekiq_worker_methods.rb
 - lib/sidekiq_unique_jobs/testing.rb
-- lib/sidekiq_unique_jobs/timeout.rb
-- lib/sidekiq_unique_jobs/timeout/calculator.rb
-- lib/sidekiq_unique_jobs/unique_args.rb
+- lib/sidekiq_unique_jobs/timer_task.rb
+- lib/sidekiq_unique_jobs/timing.rb
 - lib/sidekiq_unique_jobs/unlockable.rb
-- lib/sidekiq_unique_jobs/util.rb
+- lib/sidekiq_unique_jobs/update_version.rb
+- lib/sidekiq_unique_jobs/upgrade_locks.rb
 - lib/sidekiq_unique_jobs/version.rb
 - lib/sidekiq_unique_jobs/version_check.rb
 - lib/sidekiq_unique_jobs/web.rb
 - lib/sidekiq_unique_jobs/web/helpers.rb
 - lib/sidekiq_unique_jobs/web/views/_paging.erb
-- lib/sidekiq_unique_jobs/web/views/unique_digest.erb
-- lib/sidekiq_unique_jobs/web/views/unique_digests.erb
+- lib/sidekiq_unique_jobs/web/views/changelogs.erb
+- lib/sidekiq_unique_jobs/web/views/lock.erb
+- lib/sidekiq_unique_jobs/web/views/locks.erb
 - lib/tasks/changelog.rake
-- redis/acquire_lock.lua
-- redis/convert_legacy_lock.lua
-- redis/delete.lua
-- redis/delete_by_digest.lua
-- redis/delete_job_by_digest.lua
-- redis/lock.lua
-- redis/release_stale_locks.lua
-- redis/unlock.lua
 homepage: https://mhenrixon.github.io/sidekiq-unique-jobs
 licenses:
 - MIT
@@ -301,8 +215,34 @@ metadata:
   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/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md
+post_install_message: |
+  IMPORTANT!
+
+  Automatic configuration of the sidekiq middelware 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=
 rdoc_options: []
 require_paths:
 - lib
@@ -310,14 +250,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.6
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs