sidekiq-throttled 1.0.0.alpha → 1.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7659ca0e722a87bc85f4e9d73a38075cf005b72515bbaf06604eabaab77d8fdd
-  data.tar.gz: 28c53a85bb5d346d09d8ec08c6d23cecc687b6ec35e4c9779c07eba32bc635d6
+  metadata.gz: 714915692e57a08eeea5dd0e0be79f3becfa915669f559f3457509073b89e4fe
+  data.tar.gz: 190b4e6d013712725bb64277c00c74c82da5149f73368dbb19890090d638a372
 SHA512:
-  metadata.gz: 2b03a9d8f51981c778c4a7b0fb84d7c20dabf902eefb00518a98a4c5a028119e820cd93920946516a51e0a399e05cf2692d12e7b59b814b37045b4dc6f852c43
-  data.tar.gz: 37478b95ae4f5426f82dceec1aa918722772c9a2c785b7c94420460b897c52cc0eee1cce02f5d03214c5d28113c3c798f5c13e31fb342ae935d92a07bc60f9b7
+  metadata.gz: 7627db53db315ec4acdaf15e715186522c3dbbdc4084aadd65cd0f081845b247f92eb106bcf2e5bf41b5098400adaed00377104b21205b5914495bcacff9d625
+  data.tar.gz: 1caca54490b41115389b6ce111c4264a911aba84f656546bce0c62846d6f3828c91a1c681bfb0520f04230c6e113b9d1cd5553c500e6a65a7f6d77c2d36903a2

data/lib/sidekiq/throttled/patches/basic_fetch.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "sidekiq"
+require "sidekiq/fetch"
+
+module Sidekiq
+  module Throttled
+    module Patches
+      module BasicFetch
+        class << self
+          def apply!
+            Sidekiq::BasicFetch.prepend(self) unless Sidekiq::BasicFetch.include?(self)
+          end
+        end
+
+        # Retrieves job from redis.
+        #
+        # @return [Sidekiq::Throttled::UnitOfWork, nil]
+        def retrieve_work
+          work = super
+
+          if work && Throttled.throttled?(work.job)
+            requeue_throttled(work)
+            return nil
+          end
+
+          work
+        end
+
+        private
+
+        # Pushes job back to the head of the queue, so that job won't be tried
+        # immediately after it was requeued (in most cases).
+        #
+        # @note This is triggered when job is throttled. So it is same operation
+        #   Sidekiq performs upon `Sidekiq::Worker.perform_async` call.
+        #
+        # @return [void]
+        def requeue_throttled(work)
+          redis { |conn| conn.lpush(work.queue, work.job) }
+        end
+
+        # Returns list of queues to try to fetch jobs from.
+        #
+        # @note It may return an empty array.
+        # @param [Array<String>] queues
+        # @return [Array<String>]
+        def queues_cmd
+          queues = super
+
+          # TODO: Refactor to be prepended as an integration mixin during configuration stage
+          #   Or via configurable queues reducer
+          queues -= Sidekiq::Pauzer.paused_queues.map { |name| "queue:#{name}" } if defined?(Sidekiq::Pauzer)
+
+          queues
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/throttled/strategy_collection.rb

@@ -19,8 +19,7 @@ module Sidekiq
       # @param [#to_s] name
       # @param [#call] key_suffix Dynamic key suffix generator.
       def initialize(strategies, strategy:, name:, key_suffix:)
-        strategies = (strategies.is_a?(Hash) ? [strategies] : Array(strategies))
-        @strategies = strategies.map do |options|
+        @strategies = (strategies.is_a?(Hash) ? [strategies] : Array(strategies)).map do |options|
           make_strategy(strategy, name, key_suffix, options)
         end
       end

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "1.0.0.alpha"
+    VERSION = "1.0.0.alpha.1"
   end
 end

data/lib/sidekiq/throttled.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-# 3rd party
 require "sidekiq"
 
-# internal
 require_relative "./throttled/version"
 require_relative "./throttled/configuration"
-require_relative "./throttled/fetch"
+require_relative "./throttled/patches/basic_fetch"
 require_relative "./throttled/registry"
 require_relative "./throttled/job"
 require_relative "./throttled/middleware"
@@ -52,13 +50,7 @@ module Sidekiq
       #
       # @return [void]
       def setup!
-        Sidekiq.configure_server do |config|
-          if Gem::Version.new("7.0.0") <= Gem::Version.new(Sidekiq::VERSION)
-            config[:fetch_class] = Sidekiq::Throttled::Fetch
-          else
-            config[:fetch] = Sidekiq::Throttled::Fetch.new(config)
-          end
-        end
+        Sidekiq::Throttled::Patches::BasicFetch.apply!
       end
 
       # Tells whenever job is throttled or not.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha
+  version: 1.0.0.alpha.1
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-prescription
@@ -48,12 +48,11 @@ files:
 - LICENSE
 - README.adoc
 - lib/sidekiq/throttled.rb
-- lib/sidekiq/throttled/basic_fetch.rb
 - lib/sidekiq/throttled/configuration.rb
 - lib/sidekiq/throttled/errors.rb
-- lib/sidekiq/throttled/fetch.rb
 - lib/sidekiq/throttled/job.rb
 - lib/sidekiq/throttled/middleware.rb
+- lib/sidekiq/throttled/patches/basic_fetch.rb
 - lib/sidekiq/throttled/registry.rb
 - lib/sidekiq/throttled/strategy.rb
 - lib/sidekiq/throttled/strategy/base.rb
@@ -72,9 +71,9 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/ixti/sidekiq-throttled
-  source_code_uri: https://github.com/ixti/sidekiq-throttled/tree/v1.0.0.alpha
+  source_code_uri: https://github.com/ixti/sidekiq-throttled/tree/v1.0.0.alpha.1
   bug_tracker_uri: https://github.com/ixti/sidekiq-throttled/issues
-  changelog_uri: https://github.com/ixti/sidekiq-throttled/blob/v1.0.0.alpha/CHANGES.md
+  changelog_uri: https://github.com/ixti/sidekiq-throttled/blob/v1.0.0.alpha.1/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []

data/lib/sidekiq/throttled/basic_fetch.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq"
-require "sidekiq/fetch"
-
-module Sidekiq
-  module Throttled
-    # Default Sidekiq's BasicFetch infused with Throttler.
-    #
-    # @private
-    class BasicFetch < Sidekiq::BasicFetch
-      # Retrieves job from redis.
-      #
-      # @return [Sidekiq::Throttled::UnitOfWork, nil]
-      def retrieve_work
-        work = super
-
-        if work && Throttled.throttled?(work.job)
-          requeue_throttled(work)
-          return nil
-        end
-
-        work
-      end
-
-      private
-
-      # Pushes job back to the head of the queue, so that job won't be tried
-      # immediately after it was requeued (in most cases).
-      #
-      # @note This is triggered when job is throttled. So it is same operation
-      #   Sidekiq performs upon `Sidekiq::Worker.perform_async` call.
-      #
-      # @return [void]
-      def requeue_throttled(work)
-        redis { |conn| conn.lpush(work.queue, work.job) }
-      end
-
-      # Returns list of queues to try to fetch jobs from.
-      #
-      # @note It may return an empty array.
-      # @param [Array<String>] queues
-      # @return [Array<String>]
-      def queues_cmd
-        queues = super
-
-        # TODO: Refactor to be prepended as an integration mixin during configuration stage
-        #   Or via configurable queues reducer
-        queues -= Sidekiq::Pauzer.paused_queues.map { |name| "queue:#{name}" } if defined?(Sidekiq::Pauzer)
-
-        queues
-      end
-    end
-  end
-end

data/lib/sidekiq/throttled/fetch.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "./basic_fetch"
-
-module Sidekiq
-  module Throttled
-    # @deprecated Use Sidekiq::Throttled::BasicFetch
-    Fetch = BasicFetch
-  end
-end