sidekiq-status 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3dd7cc94267c99010ecd9b47129528e1c2a2a12
-  data.tar.gz: b2fdf88b3ff5717fa202d92652d2b9bae0c40140
+  metadata.gz: b6b4364f29e4cebdacba46d6266532b800cd0626
+  data.tar.gz: cca02102cb3f156fc54ae6bfd7c737e6bbad9d46
 SHA512:
-  metadata.gz: 6edd2298f96a0bcbcd3c7dc58426c328f159fd6de092e1764e31cfad2b07c00ba48dc4f7cdadd6e1d0b40c4e9b3c19ffb8f7af2dc33e9378f6e214a306822490
-  data.tar.gz: f4ed9c45848b094916256730db4f286733e662d3a81735490fe1285d40fea464c9d787c72fad8f17c01ad67b8081eac93ebbd28c717a7939a7479939e7338f9b
+  metadata.gz: 4e124dcb4344613124d2d3b8d58f666e7c1bf9a1c41da241db09bce9823de03486bb6e4c916fc4c5f9dbcd3bc73278715092f7709d5cc18d1f7c82b618607bbf
+  data.tar.gz: e30d1f12e9388db15a59791aabb09e7adba4a461441c24b3a73bf34d4262c4cfb76edf850488bb66ba58800a7bec173b6233dba15412351ea67af8b2996d4ebe

data/.travis.yml

@@ -1,2 +1,15 @@
 language: ruby
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+  - jruby
+  - rbx-2
+gemfile:
+  - gemfiles/Gemfile.sidekiq-2
+  - Gemfile
 services: redis
+matrix:
+  allow_failures:
+    - rvm: jruby
+    - rvm: rbx-2

data/CHANGELOG

@@ -1,3 +1,4 @@
+Version 0.5.2:Sidekiq versions up to 3.3.* supported, jobs sorting options in web UI, more ruby versions
 Version 0.5.1:dependencies versions requirements relaxed
 Version 0.5.0:Sidekiq v3 support, redis pools support
 Version 0.4.0:WebUI added, per-worker expiration setting enabled

data/gemfiles/Gemfile.sidekiq-2

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: '..'
+
+gem 'sidekiq', '~> 2.17'

data/lib/sidekiq-status/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/lib/sidekiq-status/web.rb

@@ -19,7 +19,13 @@ module Sidekiq::Status
         queue = Sidekiq::Workers.new
         @statuses = []
 
-        queue.each do |process, name, work, started_at|
+        queue.each do |*args|
+          work = if args[1].is_a?(Hash)
+            # For sidekiq < 3
+            args[1]
+          else
+            args[2]
+          end
           job = Struct.new(:jid, :klass, :args).new(work["payload"]["jid"], work["payload"]["class"], work["payload"]["args"])
           status = Sidekiq::Status::get_all job.jid
           next if !status || status.count < 2
@@ -30,6 +36,36 @@ module Sidekiq::Status
           @statuses << OpenStruct.new(status)
         end
 
+        if ["worker", "status", "update_time", "pct_complete", "message"].include?(params[:sort_by])
+          sort_by = params[:sort_by]
+        else
+          sort_by = "worker"
+        end
+
+        sort_dir = "asc"
+
+        if params[:sort_dir] == "asc"
+          @statuses = @statuses.sort { |x,y| x.send(sort_by) <=> y.send(sort_by) }
+        else # DESC
+          sort_dir = "desc"
+          @statuses = @statuses.sort { |y,x| x.send(sort_by) <=> y.send(sort_by) }
+        end
+
+        @headers = [
+          { id: "worker", name: "Worker/jid", class: nil, url: nil},
+          { id: "status", name: "Status", class: nil, url: nil},
+          { id: "update_time", name: "Last Updated", class: nil, url: nil},
+          { id: "pct_complete", name: "Progress", class: nil, url: nil},
+          { id: "message", name: "Message", class: nil, url: nil}
+        ]
+
+        @headers.each do |h|
+          params["sort_by"] = h[:id]
+          params["sort_dir"] = (sort_by == h[:id] && sort_dir == "asc") ? "desc" : "asc"
+          h[:url] = "statuses?" + params.map {|k,v| "#{k}=#{v}" }.join("&")
+          h[:class] = "sorted_#{sort_dir}" if sort_by == h[:id]
+        end
+
         erb(sidekiq_status_template(:statuses))
       end
     end

data/sidekiq-status.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.version       = Sidekiq::Status::VERSION
 
   gem.add_dependency                  'sidekiq', '>= 2.7', '< 3.4'
+  gem.add_development_dependency      'rack-test'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'rspec'
+  gem.add_development_dependency      'sinatra'
 end

data/spec/lib/sidekiq-status/web_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'sidekiq-status/web'
+require 'rack/test'
+
+describe 'sidekiq status web' do
+  include Rack::Test::Methods
+
+  let!(:redis) { Sidekiq.redis { |conn| conn } }
+  let!(:job_id) { SecureRandom.hex(12) }
+
+  # Clean Redis before each test
+  # Seems like flushall has no effect on recently published messages,
+  # so we should wait till they expire
+  before { redis.flushall; sleep 0.1 }
+
+  def app
+    Sidekiq::Web
+  end
+
+  it 'shows a job in progress' do
+    allow(SecureRandom).to receive(:hex).once.and_return(job_id)
+
+    start_server do
+      capture_status_updates(2) do
+        expect(LongJob.perform_async(1)).to eq(job_id)
+      end
+
+      get '/statuses'
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to match(/#{job_id}/)
+    end
+  end
+
+end

data/web/views/statuses.erb

@@ -1,13 +1,18 @@
-<h3 class="wi">Recent job statuses</h3>
-
+<style>
+.sorted_asc:after{
+  content: " ↑";
+}
+.sorted_desc:after{
+  content: " ↓";
+}
+</style>
 
+<h3 class="wi">Recent job statuses</h3>
 <table class="table table-striped table-bordered">
   <tr>
-    <th>Worker/jid</th>
-    <th>Status</th>
-    <th>Last Updated ↆ</th>
-    <th>Progress</th>
-    <th>Message</th>
+    <% @headers.each do |header| %>
+      <th><a href="<%= header[:url] %>" class="<%= header[:class] %>"><%= header[:name] %></a></th>
+    <% end %>
   </tr>
   <% @statuses.each do |container| %>
     <tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Evgeniy Tsvigun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - utgarda@gmail.com
@@ -73,6 +101,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.sidekiq-2
 - lib/sidekiq-status.rb
 - lib/sidekiq-status/client_middleware.rb
 - lib/sidekiq-status/server_middleware.rb
@@ -85,6 +114,7 @@ files:
 - spec/lib/sidekiq-status/client_middleware_spec.rb
 - spec/lib/sidekiq-status/server_middleware_spec.rb
 - spec/lib/sidekiq-status/testing_spec.rb
+- spec/lib/sidekiq-status/web_spec.rb
 - spec/lib/sidekiq-status/worker_spec.rb
 - spec/lib/sidekiq-status_spec.rb
 - spec/spec_helper.rb
@@ -110,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An extension to the sidekiq message processing to track your jobs
@@ -118,6 +148,7 @@ test_files:
 - spec/lib/sidekiq-status/client_middleware_spec.rb
 - spec/lib/sidekiq-status/server_middleware_spec.rb
 - spec/lib/sidekiq-status/testing_spec.rb
+- spec/lib/sidekiq-status/web_spec.rb
 - spec/lib/sidekiq-status/worker_spec.rb
 - spec/lib/sidekiq-status_spec.rb
 - spec/spec_helper.rb