sidekiq_status 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4e3282b9acea7633ee8a90aed6fe8982bc17946
-  data.tar.gz: a480a2d256f63636be9ef162cfd791cea7ebaa32
+  metadata.gz: 376e629c68f174cace73a5c67c23a4b5cf65b0a5
+  data.tar.gz: c7e5a9e689c9ec74120f426e5937aad621b7dc10
 SHA512:
-  metadata.gz: 61f4121815255d2d704cf262a9619a3ed0108a383e563188afbfb4cdd0367eb4acc32e6f14aed118c3d2eab0734046cf32571e703b3a097e0fc43debac79f1a6
-  data.tar.gz: dd87aa7efdb084aa718d0cd257c7b768d573fe6158b4f5d563172d01dd16f1608e06dccbd43c93f71de93fe95d727cf37727627b30c8188022d6e98f5a201d8e
+  metadata.gz: 008af9ea34701fc54d72d47cbb5f98a13a20763d92da4fd7c75e7bed07ebb4795cec853956f44ab37bc66db2594314db2dc3451c70bd56958224b5a8a1ae7f3b
+  data.tar.gz: f5980070fb532c61230bd70b3574bd2f598eb024015a5af56f977ec5b3f29c0c5ceafa933e5411132b91a0f3e9ca69b9183b6363ce31c4ffea14a4a28450916b

data/.travis.yml

@@ -1,18 +1,17 @@
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.4
-  - 2.3.0
-  - rbx-3.14
+  #- rbx
+  - 2.2.5
+  - 2.3.1
 env:
   global:
     - SHOW_SIDEKIQ=true
   matrix:
+    - SIDEKIQ_VERSION="~>4.2.0"
     - SIDEKIQ_VERSION="~>4.1.0"
     - SIDEKIQ_VERSION="~>4.0.2"
     - SIDEKIQ_VERSION="~>3.5.4"
     - SIDEKIQ_VERSION="~>3.4.2"
-    - SIDEKIQ_VERSION="~>3.3.4"
 
 before_install:
   - sudo apt-get -qq update

data/README.md

@@ -147,6 +147,10 @@ and clean status containers.
 
 ## Changelog
 
+### 1.2.0
+
+  * Support for sidekiq 4.2, integration with the new non-sinatra-based Sidekiq::Web (ncuesta)
+
 ### 1.1.0
 
   * Support for sidekiq 4.1, 4.0, 3.5, 3.4

data/lib/sidekiq_status/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module SidekiqStatus
   # SidekiqStatus version
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/sidekiq_status/web.rb

@@ -11,6 +11,16 @@ module SidekiqStatus
           path = File.join(VIEW_PATH, name.to_s) + ".erb"
           File.open(path).read
         end
+
+        def redirect_to(subpath)
+          if respond_to?(:to)
+            # Sinatra-based web UI
+            redirect to(subpath)
+          else
+            # Non-Sinatra based web UI (Sidekiq 4.2+)
+            redirect "#{root_path}#{subpath}"
+          end
+        end
       end
 
       app.get '/statuses' do
@@ -34,22 +44,22 @@ module SidekiqStatus
 
       app.get '/statuses/:jid/kill' do
         SidekiqStatus::Container.load(params[:jid]).request_kill
-        redirect to(:statuses)
+        redirect_to :statuses
       end
 
       app.get '/statuses/delete/all' do
         SidekiqStatus::Container.delete
-        redirect to(:statuses)
+        redirect_to :statuses
       end
 
       app.get '/statuses/delete/complete' do
         SidekiqStatus::Container.delete('complete')
-        redirect to(:statuses)
+        redirect_to :statuses
       end
 
       app.get '/statuses/delete/finished' do
         SidekiqStatus::Container.delete(SidekiqStatus::Container::FINISHED_STATUS_NAMES)
-        redirect to(:statuses)
+        redirect_to :statuses
       end
     end
   end

data/sidekiq_status.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SidekiqStatus::VERSION
 
-  gem.add_runtime_dependency("sidekiq", ">= 3.3", "< 4.2")
+  gem.add_runtime_dependency("sidekiq", ">= 3.3", "< 5")
 
   gem.add_development_dependency("activesupport")
   gem.add_development_dependency("rspec", '>= 3.4.0')

data/spec/dummy/boot.rb

@@ -2,14 +2,10 @@ require 'rubygems'
 require 'bundler'
 Bundler.require
 
+require 'active_support'
 require 'active_support/dependencies'
 
 DUMMY_APP_ROOT = Pathname.new(File.expand_path('../', __FILE__))
 Sidekiq.redis = {:url => "redis://localhost/15", :size => 5}
 
 ActiveSupport::Dependencies.autoload_paths += Dir.glob(DUMMY_APP_ROOT.join('app/*'))
-
-
-
-
-

data/web/views/status.erb

@@ -60,6 +60,6 @@
         </tr>
       </tbody>
     </table>
-    <a href="<%= to(:statuses) %>">Back</a>
+    <a href="<%= root_path %>statuses">Back</a>
   </div>
 </div>

data/web/views/statuses.erb

@@ -2,15 +2,15 @@
 
 <div class="delete_jobs">
   Delete jobs in&nbsp;
-  <a href="<%= to(:statuses) %>/delete/complete" onclick="return confirm('Are you sure? Delete is irreversible')">
+  <a href="<%= root_path %>statuses/delete/complete" onclick="return confirm('Are you sure? Delete is irreversible')">
     complete
   </a>
   ,&nbsp;
-  <a href="<%= to(:statuses) %>/delete/finished" onclick="return confirm('Are you sure? Delete is irreversible')" title="<%= SidekiqStatus::Container::FINISHED_STATUS_NAMES.join(', ') %>">
+  <a href="<%= root_path %>statuses/delete/finished" onclick="return confirm('Are you sure? Delete is irreversible')" title="<%= SidekiqStatus::Container::FINISHED_STATUS_NAMES.join(', ') %>">
     finished
   </a>
   ,&nbsp;
-  <a href="<%= to(:statuses) %>/delete/all"      onclick="return confirm('Are you sure? Delete is irreversible')">
+  <a href="<%= root_path %>statuses/delete/all"      onclick="return confirm('Are you sure? Delete is irreversible')">
     all
   </a>
   &nbsp;statuses
@@ -25,10 +25,10 @@
     <th>Message</th>
     <th>Actions</th>
   </tr>
-  <% @statuses.each do |container| -%>
+  <% @statuses.each do |container| %>
     <tr>
       <td>
-        <a href="<%= to(:statuses) %>/<%= container.jid %>">
+        <a href="<%= root_path %>/statuses/<%= container.jid %>">
           <%= container.worker %>
           <br />
           <%= container.jid %>
@@ -44,19 +44,19 @@
         </div>
       <td><%= container.message %></td>
       <td>
-        <% if container.killable? -%>
-          <a class="kill" href="<%= to(:statuses) %>/<%= container.jid %>/kill" onclick="return confirm('Are you sure?')">Kill</a>
-        <% elsif container.kill_requested? -%>
+        <% if container.killable? %>
+          <a class="kill" href="<%= root_path %>statuses/<%= container.jid %>/kill" onclick="return confirm('Are you sure?')">Kill</a>
+        <% elsif container.kill_requested? %>
           Kill requested
         <% end %>
       </td>
     </tr>
-  <% end -%>
-  <% if @statuses.empty? -%>
+  <% end %>
+  <% if @statuses.empty? %>
     <tr>
       <td colspan="6"></td>
     </tr>
-  <% end -%>
+  <% end %>
 </table>
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_status
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Artem Ignatyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -19,7 +19,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -211,4 +211,3 @@ test_files:
 - spec/integration/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
-has_rdoc: