atomic-sidekiq 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: af06b1517443b34e0a8e08127c1d730c81658c73
-  data.tar.gz: 01ad8568be11fa6c4e9c67da7422efe903d2b189
+SHA256:
+  metadata.gz: f7105489c8bcd6f544b6483f1a70f9d2e597efe83ac0ba8698a7e38de9e574c5
+  data.tar.gz: 41e6812af85bca568187cc011cc43fe535245ae7371cbaf077c9393606463f08
 SHA512:
-  metadata.gz: 4e9aa27c6fd049d84c0a8010ae8a0a636e3bbfe15ee39a5ad194ef5f7193dcca5779ea5bfe80e257ff67f87f0717da967cf8bf0e802bcb1a4ea2e7a8f45dd561
-  data.tar.gz: 340e2d9f8997c905d0e6c0df0c11baff6aa7d1218e447fd3770daacc61d513fabad4662a03b2bd36ec437c96b476fd098d5ed644a1338af64296a8142873d39c
+  metadata.gz: ee3ffc740ef11258bd1024be322c977fc223d7ba5958808ca10dc5307583170da5dac3e356da6423033579b97c12c272e1d1c699eeaa526e9f810b9818c11b4c
+  data.tar.gz: 8e65b95d1a9b04bb237c4bba8269bcf7d5ec3a2aa4d01dfee10ec7aec6095f1a71c4f97e1ed81f9fa29b0661e0dca1e21aa7b10b890087273f8a543d804f90b4

data/.rubocop.yml

@@ -19,6 +19,9 @@ Style/DoubleNegation:
 Style/Documentation:
   Enabled: false
 
+Metrics/AbcSize:
+  Max: 20
+
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb

data/atomic-sidekiq.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = "atomic-sidekiq"
-  s.version       = "1.1.2"
-  s.date          = "2018-04-02"
+  s.version       = "1.1.3"
+  s.date          = "2018-12-17"
   s.summary       = "Reliable fetcher for Sidekiq"
   s.description   = "Reliable fetcher for Sidekiq"
   s.homepage      = "https://github.com/Colex/atomic-sidekiq"

data/lib/atomic_sidekiq.rb

@@ -1,4 +1,5 @@
 require "sidekiq"
+require "sidekiq/web"
 require_relative "atomic_sidekiq/sidekiq/sidekiq"
 require_relative "atomic_sidekiq/in_flight_queue"
 require_relative "atomic_sidekiq/in_flight_keymaker"

data/lib/atomic_sidekiq/web.rb

@@ -3,33 +3,38 @@ module AtomicSidekiq
     VIEW_PATH = File.expand_path("../../web/views", __dir__)
 
     def self.registered(app)
+      register_inflight(app)
+      register_recovered(app)
+    end
+
+    def self.register_inflight(app)
       app.get "/in-flight" do
-        Web.render_in_flight
-      end
+        @jobs = AtomicSidekiq::InFlightQueue.new.list
+        @total_size = @jobs.count
+        @count = (params[:count] || 25).to_i
+        @current_page = (params[:page] || 1).to_i
 
-      app.get "/recovered" do
-        Web.render_recovered
+        start_idx = (@current_page - 1) * @count
+        end_idx = (@current_page * @count) - 1
+        @jobs = @jobs[start_idx..end_idx]
+
+        erb File.read(File.join(VIEW_PATH, "in_flight.erb"))
       end
     end
 
-    def self.render_in_flight
-      @jobs = AtomicSidekiq::InFlightQueue.new.list
-      @total_size = @jobs.count
-      @count = 25
-      @current_page = (params[:page] || 1).to_i
-      @jobs = @jobs[@current_page..(@current_page + @count)]
-      erb File.read(File.join(VIEW_PATH, "in_flight.erb"))
-    end
+    def self.register_recovered(app)
+      app.get "/recovered" do
+        @queues = AtomicSidekiq::RecoveredStats.new.stats_by_queue
+        @jobs = AtomicSidekiq::RecoveredStats.new.stats_by_job
 
-    def self.render_recovered
-      @queues = AtomicSidekiq::RecoveredStats.new.stats_by_queue
-      @jobs = AtomicSidekiq::RecoveredStats.new.stats_by_job
-      erb File.read(File.join(VIEW_PATH, "recovered.erb"))
+        erb File.read(File.join(VIEW_PATH, "recovered.erb"))
+      end
     end
   end
 end
 
-require "sidekiq/web" unless defined?(Sidekiq::Web)
-Sidekiq::Web.register(AtomicSidekiq::Web)
-Sidekiq::Web.tabs["In-flight"] = "in-flight"
-Sidekiq::Web.tabs["Recovered"] = "recovered"
+if defined?(Sidekiq::Web)
+  Sidekiq::Web.register(AtomicSidekiq::Web)
+  Sidekiq::Web.tabs["In-flight"] = "in-flight"
+  Sidekiq::Web.tabs["Recovered"] = "recovered"
+end

data/web/views/in_flight.erb

@@ -28,7 +28,7 @@
       <th><%= t("Queue") %></th>
       <th><%= t("Expires at") %></th>
     </thead>
-    <% @jobs.each do |job| %>
+    <% @jobs&.each do |job| %>
       <tr>
         <td><%= h job["class"] %> </td>
         <td><%= h job["args"] %> </td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomic-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Alex Correia Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Reliable fetcher for Sidekiq