sidekiq-web_custom 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b843dd9ee6f1e39c88bea10dacd981c943cce580ae2f8fefa699cc4f98a148c
-  data.tar.gz: 822d7ddf7bdff16b66ea2d0259355d98e9abb140e33d89043f2b3fb04aa8de50
+  metadata.gz: 815bd23151114eb4c72a9f191c8038a394a8f3dd50b8209eb11cd1df03a70246
+  data.tar.gz: 3be935aeb2523cbe18febb5f1e173bb4b5fe8c1e9cad07f1a2338d4a81010e0a
 SHA512:
-  metadata.gz: 440af8e263e8e989282afa19601b296c11eb370304b37d4e8089c912c9990aae485412627e353132daa772090fc43c2ba62d2a377f8c8cfa265d9b3d31d97a49
-  data.tar.gz: 639231fad41d053fc900801985b1650c37c94eb0128e3b72a8825f1ef3c6e3092fabc2b2809f11db453c28e413e6ffbbfbbc7e31c2d0168dc14c8cb3f01c66da
+  metadata.gz: b3f0257f49ef4d2170e50923489f70404d792ede869b3298f415b3c9d56f32edb5d9564adb2c50ab9e319598752f19a1515531901f8f357754111ea23a042887
+  data.tar.gz: dceab9cddad2591ddc1d9ba657c0958443684616557bd0c51653996369c415ba7911119bf9a20a7f5d9f7a8e8a85145654eba59a5e6920fc5c1f4e3f17f0364c

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 
 gem 'rails'
-gem 'pry-byebug'
+gem 'pry'
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem 'rspec_junit_formatter'

data/Gemfile.lock

@@ -2,182 +2,193 @@ PATH
   remote: .
   specs:
     sidekiq-web_custom (0.4.1)
-      sidekiq (~> 6.0)
+      sidekiq (~> 6.5)
       timeoutable (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.3.1)
+      actionview (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (7.0.3.1)
+      activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activestorage (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     builder (3.2.4)
-    byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
+    digest (3.1.0)
     docile (1.4.0)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.0.3)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.7-x86_64-linux)
+    mini_mime (1.1.2)
+    minitest (5.16.3)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.3.1)
+      actioncable (= 7.0.3.1)
+      actionmailbox (= 7.0.3.1)
+      actionmailer (= 7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actiontext (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.2)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.3.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    railties (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rake (13.0.3)
-    redis (4.6.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+      zeitwerk (~> 2.5)
+    rake (13.0.6)
+    redis (4.7.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rspec_junit_formatter (0.4.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    sidekiq (6.4.1)
+    sidekiq (6.5.4)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      redis (>= 4.2.0)
+      redis (>= 4.5.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (1.1.0)
-    timeout (0.2.0)
+    simplecov_json_formatter (0.1.4)
+    strscan (3.0.4)
+    thor (1.2.1)
+    timeout (0.3.0)
     timeoutable (1.1.1)
       timeout
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  pry-byebug
+  pry
   rails
   rake (~> 13.0)
   rspec (~> 3.0)
@@ -186,4 +197,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.2.19
+   2.3.20

data/lib/sidekiq/web_custom/processor.rb

@@ -4,49 +4,50 @@ module Sidekiq
   module WebCustom
     class Processor < ::Sidekiq::Processor
 
-      def self.execute(max:, queue:, options: Sidekiq.options)
+      def self.execute(max:, queue:, options: Sidekiq)
         __processor__(queue: queue, options: options).__execute(max: max)
       end
 
-      def self.execute_job(job:, options: Sidekiq.options)
+      def self.execute_job(job:, options: Sidekiq)
         __processor__(queue: job.queue, options: options).__execute_job(job: job)
       rescue StandardError => _
         false # error gets loggged downstream
       end
 
-      def self.__processor__(queue:, options: Sidekiq.options)
-        options_temp = options.clone
+      def self.__processor__(queue:, options: Sidekiq)
+        options_temp = options.dup
         queue = queue.is_a?(String) ? Sidekiq::Queue.new(queue) : queue
 
         options_temp[:queues] = [queue.name]
         klass = options_temp[:fetch]&.class || BasicFetch
         options_temp[:fetch] = klass.new(options_temp)
-        new(manager: nil, options: options_temp, queue: queue)
+
+        new(options: options_temp, queue: queue)
       end
 
-      def initialize(manager:, options:, queue:)
+      def initialize(options:, queue:)
         @__queue = queue
         @__basic_fetch = options[:fetch].class == BasicFetch
 
-        super(manager, options)
+        super(options)
       end
 
       def __execute_job(job:)
         queue_name = "queue:#{job.queue}"
         work_unit = Sidekiq::BasicFetch::UnitOfWork.new(queue_name, job.item.to_json)
         begin
-          Sidekiq.logger.info "Manually processing individual work unit for #{work_unit.queue_name}"
+          logger.info "Manually processing individual work unit for #{work_unit.queue_name}"
           process(work_unit)
         rescue StandardError => e
-          Sidekiq.logger.error "Manually processed work unit failed with #{e.message}. Work unit will not be dequeued"
+          logger.error "Manually processed work unit failed with #{e.message}. Work unit will not be dequeued"
           raise e
         end
 
         begin
           job.delete
-          Sidekiq.logger.info { "Manually processed work unit sucessfully dequeued." }
+          logger.info { "Manually processed work unit sucessfully dequeued." }
         rescue StandardError => e
-          Sidekiq.logger.fatal "Manually processed work unit failed to be dequeued. #{e.message}."
+          logger.fatal "Manually processed work unit failed to be dequeued. #{e.message}."
           raise e
         end
 
@@ -59,21 +60,21 @@ module Sidekiq
           break if @__queue.size <= 0
 
           if Thread.current[Sidekiq::WebCustom::BREAK_BIT]
-            Sidekiq.logger.warn "Yikes -- Break bit has been set. Attempting to return in time. Completed #{count} of attempted #{max}"
+            logger.warn "Yikes -- Break bit has been set. Attempting to return in time. Completed #{count} of attempted #{max}"
             break
           end
 
-          Sidekiq.logger.info { "Manually processing next item in queue:[#{@__queue.name}]" }
+          logger.info { "Manually processing next item in queue:[#{@__queue.name}]" }
           process_one
           count += 1
-
         end
+
         count
       rescue Exception => ex
         if @job && @__basic_fetch
-          Sidekiq.logger.fatal "Processor Execution interrupted. Lost Job #{@job.job}"
+          logger.fatal "Processor Execution interrupted. Lost Job #{@job.job}"
         end
-        Sidekiq.logger.warn "Manual execution has terminated. Received error [#{ex.message}]"
+        logger.warn "Manual execution has terminated. Received error [#{ex.message}]"
         return count
       end
     end

data/lib/sidekiq/web_custom/version.rb

@@ -3,8 +3,8 @@
 module Sidekiq
   module WebCustom
     MAJOR = 0  # With backwards incompatability. Requires annoucment and update documentation
-    MINOR = 4  # With feature launch. Documentation of upgrade is useful via a changelog
-    PATCH = 1  # With minor upgrades or patcing a small bug. No changelog necessary
+    MINOR = 5  # With feature launch. Documentation of upgrade is useful via a changelog
+    PATCH = 0  # With minor upgrades or patcing a small bug. No changelog necessary
     VERSION = [MAJOR,MINOR,PATCH].join('.')
 
     def self.get_version

data/lib/sidekiq/web_custom.rb

@@ -84,12 +84,7 @@ module Sidekiq
       @__already_called = true
       ::Sidekiq::WebAction.prepend WebAction
       ::Sidekiq::Queue.prepend Queue
-
-      if ::Sidekiq::VERSION >= "6.4.0"
-        ::Sidekiq::JobRecord.prepend Job
-      else
-        ::Sidekiq::Job.prepend Job
-      end
+      ::Sidekiq::JobRecord.prepend Job
 
       ::Sidekiq::Web.register WebApp
     end

data/sidekiq-web_custom.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   DOC
   spec.homepage      = "https://github.com/matt-taylor/sidekiq-web_custom"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7")
 
   # spec.metadata["allowed_push_host"] = "Set to 'http://mygemserver.com'"
 
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'sidekiq', '~> 6.0'
+  spec.add_dependency 'sidekiq', '~> 6.5'
   spec.add_dependency 'timeoutable', '>= 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-web_custom
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-09 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: timeoutable
   requirement: !ruby/object:Gem::Requirement
@@ -139,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: This gem adds on custom capabilities to the Sidekiq Web UI