sidekiq-unique-jobs 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ac11b6577e3aec68065e79d9d5b61d67b88e958c23097b04409869e4a6c18f
-  data.tar.gz: d6d8f8244abf8b4dacfc28a313b94d89edee88002052618f018ea81fc29cb32a
+  metadata.gz: 481e40d622fd6b93108784749fcbb27ece9243ad6d375562666ab783245194a1
+  data.tar.gz: da1a60f10e0b6259f37e42fd7b59927fa3fd15506d2a193329726c5797a93211
 SHA512:
-  metadata.gz: dfc16d255733a016d93b1a5699f740732c4e2095ecbe20e9562512c4a2ab0dd51c221a681b7ee9e6ccdb9ce9b90a1dcd2a8902d26089658b3936f2e0667ca1b3
-  data.tar.gz: dd52aa2aa2ec53260e8ba8569827bc825e926e3245585731e17130693ef588c8482ad0539f74fa6ce43436d6476b38cf8e0303990b6689783b2ce6277f05f1c4
+  metadata.gz: 7547df950b2b0bbd7b11de1ad53887f011a398198b99f77bde41bc09cd174b5df7d0aee2f894fbdad39b758d6ec117d9ec5837789731f6cab630a196a16c7388
+  data.tar.gz: 6996d1d36543e925ee667ca19fb50bd429d0fb54ea74ac49b9e53de91f63c6e5066d0df8d224f25ceb41d2bfe06413a0dde42b97e2b49cc0896b4207f6ca3e7b

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changelog
 
-## [Unreleased](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/HEAD)
+## [v7.0.6](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.6) (2021-03-19)
 
-[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.5...HEAD)
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.5...v7.0.6)
 
 **Fixed bugs:**
 
 - Deprecation warning for redis behaviour change in 5.0 [\#579](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/579)
+- Consider a match only when both values present [\#586](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/586) ([mhenrixon](https://github.com/mhenrixon))
+
+**Closed issues:**
+
+- Reaper: undefined method `delete\_suffix' for nil:NilClass [\#585](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/585)
 
 ## [v7.0.5](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.5) (2021-03-18)
 
@@ -50,6 +55,10 @@
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.1...v7.0.2)
 
+**Implemented enhancements:**
+
+- Give user full control over adding middleware [\#566](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/566) ([mhenrixon](https://github.com/mhenrixon))
+
 **Fixed bugs:**
 
 - Lock not getting properly cleared for some jobs [\#560](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/560)
@@ -200,6 +209,10 @@
 
 - ConnectionPool::TimeoutError and :until\_executed [\#535](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/535)
 
+**Merged pull requests:**
+
+- Support apartment [\#540](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/540) ([mhenrixon](https://github.com/mhenrixon))
+
 ## [v7.0.0.beta24](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta24) (2020-09-27)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta23...v7.0.0.beta24)
@@ -382,6 +395,10 @@
 - Please keep some recent versions on rubygems.org [\#478](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/478)
 - validate\_worker! throws error [\#466](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/466)
 
+**Merged pull requests:**
+
+- Allow v7 configuration to work [\#479](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/479) ([mhenrixon](https://github.com/mhenrixon))
+
 ## [v7.0.0.beta11](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta11) (2020-03-21)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta10...v7.0.0.beta11)
@@ -417,6 +434,7 @@
 
 **Fixed bugs:**
 
+- Use thread-safe digest creation mechanism [\#484](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/484) ([mhenrixon](https://github.com/mhenrixon))
 - Fix access to lock [\#476](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/476) ([mhenrixon](https://github.com/mhenrixon))
 - Backport v7 fix for conflicts [\#461](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/461) ([mhenrixon](https://github.com/mhenrixon))
 
@@ -664,6 +682,7 @@
 - Version 6: lets you schedule job with missing arguments [\#351](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/351)
 - Version 6 Ignores Jobs Enqueued in Version 5 [\#345](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/345)
 - Job will not enqueue even with no existing match [\#342](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/342)
+- Convert v5 locks when needed [\#375](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/375) ([mhenrixon](https://github.com/mhenrixon))
 
 **Closed issues:**
 
@@ -870,6 +889,7 @@
 - Sidekiq web [\#297](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/297) ([mhenrixon](https://github.com/mhenrixon))
 - Document code [\#296](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/296) ([mhenrixon](https://github.com/mhenrixon))
 - Rename to `unique:` to `lock:` [\#295](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/295) ([mhenrixon](https://github.com/mhenrixon))
+- Only unlock not delete [\#285](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/285) ([mhenrixon](https://github.com/mhenrixon))
 
 **Closed issues:**
 
@@ -913,7 +933,6 @@
 **Implemented enhancements:**
 
 - Prepare for v6 [\#286](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/286) ([mhenrixon](https://github.com/mhenrixon))
-- Only unlock not delete [\#285](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/285) ([mhenrixon](https://github.com/mhenrixon))
 
 ## [v6.0.0.rc3](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.0.rc3) (2018-06-29)
 
@@ -1014,7 +1033,6 @@
 - Remove unnecessary monkey patches for String [\#262](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/262) ([zormandi](https://github.com/zormandi))
 - README \> While Executing: remove unnecessary word [\#260](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/260) ([TimCannady](https://github.com/TimCannady))
 - Don't skip monkeypatches if ActiveSupport present [\#248](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/248) ([dleavitt](https://github.com/dleavitt))
-- Better runtime locks [\#241](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/241) ([mhenrixon](https://github.com/mhenrixon))
 
 ## [v5.0.10](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v5.0.10) (2017-08-19)
 
@@ -1042,6 +1060,7 @@
 
 **Merged pull requests:**
 
+- Better runtime locks [\#241](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/241) ([mhenrixon](https://github.com/mhenrixon))
 - Your testing lib is broken and don't permit to test uniqueness of jobs [\#232](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/232) ([keysen](https://github.com/keysen))
 - Use hscan for Util\#expire [\#229](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/229) ([dmkc](https://github.com/dmkc))
 - Fixed documentation example about unique\_args [\#228](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/228) ([andresakata](https://github.com/andresakata))

data/lib/sidekiq_unique_jobs/changelog.rb

@@ -68,8 +68,8 @@ module SidekiqUniqueJobs
         end
 
         [
-          total_size,
-          result[0], # next_cursor
+          total_size.to_i,
+          result[0].to_i, # next_cursor
           result[1].map { |entry| load_json(entry[0]) }, # entries
         ]
       end

data/lib/sidekiq_unique_jobs/digests.rb

@@ -104,8 +104,8 @@ module SidekiqUniqueJobs
         end
 
         [
-          total_size,
-          digests[0], # next_cursor
+          total_size.to_i,
+          digests[0].to_i, # next_cursor
           digests[1].map { |digest, score| Lock.new(digest, time: score) }, # entries
         ]
       end

data/lib/sidekiq_unique_jobs/version.rb

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

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/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') %>" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.0.6
+  version: 7.0.7
 platform: ruby
 authors:
 - Mikael Henriksson