sidekiq-unique-jobs 7.0.2 → 7.1.12

data/lib/sidekiq_unique_jobs/timer_task.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module SidekiqUniqueJobs
+  # @see [Concurrent::TimerTask] https://www.rubydoc.info/gems/concurrent-ruby/Concurrent/TimerTask
+  #
+  class TimerTask < ::Concurrent::TimerTask
+    private
+
+    def ns_initialize(opts, &task)
+      set_deref_options(opts)
+
+      self.execution_interval = opts[:execution] || opts[:execution_interval] || EXECUTION_INTERVAL
+      self.timeout_interval = opts[:timeout] || opts[:timeout_interval] || TIMEOUT_INTERVAL
+      @run_now  = opts[:now] || opts[:run_now]
+      @executor = Concurrent::RubySingleThreadExecutor.new
+      @running  = Concurrent::AtomicBoolean.new(false)
+      @task     = task
+      @value    = nil
+
+      self.observers = Concurrent::Collection::CopyOnNotifyObserverSet.new
+    end
+
+    def schedule_next_task(interval = execution_interval)
+      exec_task = ->(completion) { execute_task(completion) }
+      Concurrent::ScheduledTask.execute(interval, args: [Concurrent::Event.new], &exec_task)
+      nil
+    end
+
+    # @!visibility private
+    def execute_task(completion) # rubocop:disable Metrics/MethodLength
+      return nil unless @running.true?
+
+      timeout_task = -> { timeout_task(completion) }
+
+      Concurrent::ScheduledTask.execute(
+        timeout_interval,
+        args: [completion],
+        &timeout_task
+      )
+      @thread_completed = Concurrent::Event.new
+
+      @value = @reason  = nil
+      @executor.post do
+        @value = @task.call(self)
+      rescue Exception => ex # rubocop:disable Lint/RescueException
+        @reason = ex
+      ensure
+        @thread_completed.set
+      end
+
+      @thread_completed.wait
+
+      if completion.try?
+        schedule_next_task
+        time = Time.now
+        observers.notify_observers do
+          [time, value, @reason]
+        end
+      end
+      nil
+    end
+
+    # @!visibility private
+    def timeout_task(completion)
+      return unless @running.true?
+      return unless completion.try?
+
+      @executor.kill
+      @executor.wait_for_termination
+      @executor = Concurrent::RubySingleThreadExecutor.new
+
+      @thread_completed.set
+
+      schedule_next_task
+      observers.notify_observers(Time.now, nil, Concurrent::TimeoutError.new)
+    end
+  end
+end

data/lib/sidekiq_unique_jobs/timing.rb

@@ -51,7 +51,7 @@ module SidekiqUniqueJobs
       if Process.const_defined?("CLOCK_MONOTONIC")
         Process.clock_gettime(Process::CLOCK_MONOTONIC)
       else
-        Time.now.to_f
+        now_f
       end
     end
   end

data/lib/sidekiq_unique_jobs/version.rb

@@ -3,5 +3,5 @@
 module SidekiqUniqueJobs
   #
   # @return [String] the current SidekiqUniqueJobs version
-  VERSION = "7.0.2"
+  VERSION = "7.1.12"
 end

data/lib/sidekiq_unique_jobs/web/helpers.rb

@@ -13,7 +13,9 @@ module SidekiqUniqueJobs
       VIEW_PATH    = File.expand_path("../web/views", __dir__).freeze
       #
       # @return [Array<String>] safe params
-      SAFE_CPARAMS = %w[cursor prev_cursor].freeze
+      SAFE_CPARAMS = %w[
+        filter count cursor prev_cursor poll direction
+      ].freeze
 
       extend self
 
@@ -67,10 +69,8 @@ module SidekiqUniqueJobs
       # @return [String] a url safe parameter string
       #
       def cparams(options)
-        # stringify
-        options.transform_keys(&:to_s)
-
-        params.merge(options).map do |key, value|
+        stringified_options = options.transform_keys(&:to_s)
+        params.merge(stringified_options).map do |key, value|
           next unless SAFE_CPARAMS.include?(key)
 
           "#{key}=#{CGI.escape(value.to_s)}"

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

@@ -1,10 +1,10 @@
 <ul class="pagination pull-right flip">
   <% if @prev_cursor %>
-    <li>
-      <a href="<%= url %>?<%= cparams(cursor: @prev_cursor, prev_cursor: @next_cursor) %>">Previous <%= @count %></a>
-    </li>
+  <li>
+    <a href="<%= url %>?<%= cparams(filter: @filter, cursor: @prev_cursor, prev_cursor: @next_cursor) %>">Previous <%= @count %></a>
+  </li>
   <% end %>
   <li>
-    <a href="<%= url %>?<%= cparams(cursor: @next_cursor, prev_cursor: @current_cursor) %>">Next <%= @count %></a>
+    <a href="<%= url %>?<%= cparams(filter: @filter, cursor: @next_cursor, prev_cursor: @current_cursor) %>">Next <%= @count %></a>
   </li>
 </ul>

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

@@ -36,7 +36,7 @@
     </thead>
     <tbody>
     <% @changelogs.each do |changelog| %>
-      <tr>
+      <tr  class="changelog-row">
         <td><%= safe_relative_time(changelog["time"]) %></td>
         <td><%= changelog["digest"] %></td>
         <td><%= changelog["script"] %></td>

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

@@ -11,7 +11,7 @@
     <%= t('Filter') %>
     </button>
   </form>
-  <% if @locks.any? && @total_size > @count.to_i %>
+  <% if @locks.any? && @total_size > @count %>
   <div class="col-sm-4">
     <%= erb unique_template(:_paging), locals: { url: "#{root_path}locks" } %>
   </div>
@@ -30,20 +30,22 @@
       </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 %>
+    <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') %>" />

data/lib/sidekiq_unique_jobs/web.rb

@@ -19,8 +19,11 @@ module SidekiqUniqueJobs
         @count          = (params[:count] || 100).to_i
         @current_cursor = params[:cursor]
         @prev_cursor    = params[:prev_cursor]
-        @pagination     = { pattern: @filter, cursor: @current_cursor, page_size: @count }
-        @total_size, @next_cursor, @changelogs = changelog.page(**@pagination)
+        @total_size, @next_cursor, @changelogs = changelog.page(
+          cursor: @current_cursor,
+          pattern: @filter,
+          page_size: @count,
+        )
 
         erb(unique_template(:changelogs))
       end
@@ -36,8 +39,12 @@ module SidekiqUniqueJobs
         @count          = (params[:count] || 100).to_i
         @current_cursor = params[:cursor]
         @prev_cursor    = params[:prev_cursor]
-        @pagination     = { pattern: @filter, cursor: @current_cursor, page_size: @count }
-        @total_size, @next_cursor, @locks = digests.page(**@pagination)
+
+        @total_size, @next_cursor, @locks = digests.page(
+          cursor: @current_cursor,
+          pattern: @filter,
+          page_size: @count,
+        )
 
         erb(unique_template(:locks))
       end

data/lib/sidekiq_unique_jobs.rb

@@ -3,9 +3,10 @@
 require "brpoplpush/redis_script"
 require "concurrent/future"
 require "concurrent/promises"
-require "concurrent/timer_task"
 require "concurrent/map"
 require "concurrent/mutable_struct"
+require "concurrent/timer_task"
+require "concurrent/executor/ruby_single_thread_executor"
 require "digest"
 require "digest/sha1"
 require "erb"
@@ -14,6 +15,10 @@ require "json"
 require "pathname"
 require "sidekiq"
 
+require "sidekiq_unique_jobs/deprecation"
+require "sidekiq_unique_jobs/reflections"
+require "sidekiq_unique_jobs/reflectable"
+require "sidekiq_unique_jobs/timer_task"
 require "sidekiq_unique_jobs/version"
 require "sidekiq_unique_jobs/version_check"
 require "sidekiq_unique_jobs/constants"
@@ -39,6 +44,7 @@ require "sidekiq_unique_jobs/batch_delete"
 require "sidekiq_unique_jobs/orphans/reaper"
 require "sidekiq_unique_jobs/orphans/observer"
 require "sidekiq_unique_jobs/orphans/manager"
+require "sidekiq_unique_jobs/orphans/reaper_resurrector"
 require "sidekiq_unique_jobs/cli"
 require "sidekiq_unique_jobs/core_ext"
 require "sidekiq_unique_jobs/lock_timeout"

data/lib/tasks/changelog.rake

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
+# rubocop:disable Style/MutableConstant
+CHANGELOG_CMD = %w[
+  github_changelog_generator
+  --no-verbose
+  --user
+  mhenrixon
+  --project
+  sidekiq-unique-jobs
+  --token
+]
+ADD_CHANGELOG_CMD = "git add --all"
+COMMIT_CHANGELOG_CMD = "git commit -a -m 'Update changelog'"
+# rubocop:enable Style/MutableConstant
+
 desc "Generate a Changelog"
 task :changelog do
-  # rubocop:disable Style/MutableConstant
-  CHANGELOG_CMD ||= %w[
-    github_changelog_generator
-    --no-verbose
-    --user
-    mhenrixon
-    --project
-    sidekiq-unique-jobs
-    --token
-  ]
-  ADD_CHANGELOG_CMD ||= "git add --all"
-  COMMIT_CHANGELOG_CMD ||= "git commit -a -m 'Update changelog'"
-  # rubocop:enable Style/MutableConstant
-
-  sh("git checkout master")
+  sh("git checkout main")
   sh(*CHANGELOG_CMD.push(ENV["CHANGELOG_GITHUB_TOKEN"]))
   sh(ADD_CHANGELOG_CMD)
   sh(COMMIT_CHANGELOG_CMD)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.12
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.1.1
     - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.1.1
     - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -59,7 +59,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: |
   Prevents simultaneous Sidekiq jobs with the same unique arguments to run.
   Highly configurable to suite your specific needs.
@@ -113,6 +113,7 @@ files:
 - lib/sidekiq_unique_jobs/connection.rb
 - lib/sidekiq_unique_jobs/constants.rb
 - lib/sidekiq_unique_jobs/core_ext.rb
+- lib/sidekiq_unique_jobs/deprecation.rb
 - lib/sidekiq_unique_jobs/digests.rb
 - lib/sidekiq_unique_jobs/exceptions.rb
 - lib/sidekiq_unique_jobs/job.rb
@@ -176,6 +177,7 @@ files:
 - 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/reaper_resurrector.rb
 - lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb
 - lib/sidekiq_unique_jobs/redis.rb
 - lib/sidekiq_unique_jobs/redis/entity.rb
@@ -184,6 +186,8 @@ files:
 - 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/reflectable.rb
+- lib/sidekiq_unique_jobs/reflections.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
@@ -193,6 +197,7 @@ files:
 - 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/timer_task.rb
 - lib/sidekiq_unique_jobs/timing.rb
 - lib/sidekiq_unique_jobs/unlockable.rb
 - lib/sidekiq_unique_jobs/update_version.rb
@@ -210,15 +215,11 @@ homepage: https://mhenrixon.github.io/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
+  rubygems_mfa_required: 'true'
 post_install_message: |
   IMPORTANT!
 
-  Automatic configuration of the sidekiq middelware is no longer done.
+  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
@@ -249,14 +250,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs