sidekiq-failures 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e856dd820aab39c74c1206b00aecebfaa2b1532d
-  data.tar.gz: 0c639951b4f5f9b6e0621e59a13fd839c67c7400
+SHA256:
+  metadata.gz: 411bc0eb000e29f27b3d5afd27e39719c693df17ce7b08baace66e42f4b8c402
+  data.tar.gz: 88174d41395b3953bf089590775e8e34725c4f47109a379727df08c4331ad8d8
 SHA512:
-  metadata.gz: 99093da61f43fa228f73cf872e3e2a8d38a38745acdf7ca0bddca02de9e36cce1092f8ab3cb0a9f0cc20823a37ac21743fecedc2d17c1a57194fa9c9670e951e
-  data.tar.gz: b04bf490ec4caa513fee332c21fb317bed2cf41192b0da42199aa79f5d7ec19c0713a4fde3047b091c4650efd7a4db059de452ac40f0e1f0aff191ac47d1ede2
+  metadata.gz: 90a60cb2e7b0e8dac73aa3cc188d81e4616354ecdc259bb82680fea63cf2e171e19ddb009f21b686ab95fe30fcb9b0090d45335aaaf16c4985d9770e584aa749
+  data.tar.gz: 76886912d60887ed578b1b9d2e3ac0b4824b0db0087d776f590ef6c2cf060ad543d331848173c4e0c285ce72789c315586a4bbea6ce7f8b777db9ea17a293057

data/.travis.yml

@@ -3,9 +3,6 @@ sudo: false
 cache: bundler
 services:
   - redis-server
-before_install:
-  - gem install bundler
-  - gem update bundler
 rvm:
   - jruby-9.1.6.0
   - 2.2.4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 1.0.1
+
+  * Add license config to the gemspec (#115 @reiz)
+  * Guard against failure error_message being `nil` (#122 @mcasper)
+  * Fix filtering failures with 0 results on Sidekiq Pro (#125 @substars)
+
 ## 1.0.0
 
   * WebUI improvements (@bbtfr)

data/Gemfile

@@ -4,3 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sidekiq', ENV['SIDEKIQ_VERSION'] if ENV['SIDEKIQ_VERSION']
+
+# to test Pro-specific functionality, set SIDEKIQ_PRO_CREDS on `bundle install`
+# and SIDEKIQ_PRO_VERSION on `bundle install` and `rake test`
+source "https://#{ENV['SIDEKIQ_PRO_CREDS']}@enterprise.contribsys.com/" do    
+    gem 'sidekiq-pro', ENV['SIDEKIQ_PRO_VERSION'] if ENV['SIDEKIQ_PRO_VERSION']
+end if ENV['SIDEKIQ_PRO_VERSION']

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/sidekiq/failures/views/failures.erb

@@ -2,7 +2,7 @@
   <div class="col-sm-5">
     <h3><%= t('FailedJobs') %></h3>
   </div>
-  <% if @failures.size > 0 && @total_size > @count %>
+  <% if @failures.count > 0 && @total_size > @count %>
     <div class="col-sm-4">
       <%= erb :_paging, :locals => { :url => "#{root_path}failures" } %>
     </div>
@@ -10,7 +10,7 @@
   <%= filtering('failures') if respond_to?(:filtering) %>
 </header>
 
-<% if @failures.size > 0 %>
+<% if @failures.count > 0 %>
   <form action="<%= root_path %>failures" method="post">
     <%= csrf_tag if respond_to?(:csrf_tag) %>
     <table class="table table-striped table-bordered table-white">
@@ -45,7 +45,7 @@
           </td>
           <td style="overflow: auto; padding: 10px;">
             <a class="backtrace" href="#" onclick="$(this).next().toggle(); return false">
-              <%= h entry['error_class'] %>: <%= h entry['error_message'].size > 500 ? entry['error_message'][0..500] + '...' : entry['error_message'] %>
+              <%= h entry['error_class'] %>: <%= h entry['error_message'].to_s.size > 500 ? entry['error_message'][0..500] + '...' : entry['error_message'] %>
             </a>
             <pre style="display: none; background: none; border: 0; width: 100%; max-height: 30em; font-size: 0.8em; white-space: nowrap; overflow: auto;">
               <%= entry['error_backtrace'].join("<br />") if entry['error_backtrace'] %>
@@ -70,7 +70,7 @@
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
 
-  <% if @failures.size > 0 && @total_size > @count %>
+  <% if @failures.count > 0 && @total_size > @count %>
     <div class="col-sm-4">
       <%= erb :_paging, :locals => { :url => "#{root_path}failures" } %>
     </div>

data/lib/sidekiq/failures/web_extension.rb

@@ -86,7 +86,7 @@ module Sidekiq
         app.post '/filter/failures' do
           @failures = Sidekiq::Failures::FailureSet.new.scan("*#{params[:substr]}*")
           @current_page = 1
-          @count = @total_size = @failures.size
+          @count = @total_size = @failures.count          
           render(:erb, File.read(File.join(view_path, "failures.erb")))
         end
       end

data/sidekiq-failures.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Keep track of Sidekiq failed jobs}
   gem.summary       = %q{Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you browse them. Makes use of Sidekiq's custom tabs and middleware chain.}
   gem.homepage      = "https://github.com/mhfs/sidekiq-failures/"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -17,6 +18,13 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "sidekiq", ">= 4.0.0"
 
+  # Redis 4.X is incompatible with Ruby < 2.3, but the Ruby version constraint
+  # wasn't added until 4.1.2, meaning you can get an incompatible version of the
+  # redis gem when running Ruby 2.2 without this constraint.
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0")
+    gem.add_dependency "redis", "< 4.0"
+  end
+
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rack-test"

data/test/middleware_test.rb

@@ -6,7 +6,7 @@ module Sidekiq
       before do
         $invokes = 0
         @boss = MiniTest::Mock.new
-        2.times { @boss.expect(:options, {:queues => ['default'] }, []) }
+        num_options_calls.times { @boss.expect(:options, {:queues => ['default'] }, []) }
         @processor = ::Sidekiq::Processor.new(@boss)
         Sidekiq.server_middleware {|chain| chain.add Sidekiq::Failures::Middleware }
         Sidekiq.redis = REDIS
@@ -232,7 +232,7 @@ module Sidekiq
 
         3.times do
           boss = MiniTest::Mock.new
-          2.times { boss.expect(:options, {:queues => ['default'] }, []) }
+          num_options_calls.times { boss.expect(:options, {:queues => ['default'] }, []) }
           processor = ::Sidekiq::Processor.new(boss)
 
           actor = MiniTest::Mock.new
@@ -278,6 +278,14 @@ module Sidekiq
       def create_work(msg)
         Sidekiq::BasicFetch::UnitOfWork.new('default', Sidekiq.dump_json(msg))
       end
+
+      def num_options_calls
+        if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('5.0.3')
+          3
+        else
+          2
+        end
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require "minitest/mock"
 require "rack/test"
 
 require "sidekiq"
+require "sidekiq-pro" if ENV['SIDEKIQ_PRO_VERSION']
 require "sidekiq-failures"
 require "sidekiq/processor"
 require "sidekiq/fetch"

data/test/web_extension_test.rb

@@ -5,7 +5,7 @@ module Sidekiq
   describe "WebExtension" do
     include Rack::Test::Methods
 
-    TOKEN = rand(2**128-1).freeze
+    TOKEN = SecureRandom.base64(32).freeze
 
     def app
       Sidekiq::Web
@@ -138,6 +138,14 @@ module Sidekiq
         last_response.status.must_equal 200
         last_response.body.must_match(/No failed jobs found/)
       end
+
+      it 'can handle failures with nil error_message' do
+        create_sample_failure(error_message: nil)
+
+        get '/failures'
+
+        last_response.status.must_equal 200
+      end
     end
 
     describe 'when there is failure' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Marcelo Silveira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -126,9 +126,10 @@ files:
 - test/test_helper.rb
 - test/web_extension_test.rb
 homepage: https://github.com/mhfs/sidekiq-failures/
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,9 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you
   browse them. Makes use of Sidekiq's custom tabs and middleware chain.