Closes sidekiq#1120 Removed slim.

Changes.md

@@ -4,6 +4,7 @@
 - Fix more race conditions in Web UI actions
 - Don't reset Job enqueued\_at when retrying
 - Timestamp tooltips in the Web UI should use UTC
+- Removed slim dependency [Locke23rus, #1120]
 
 
 2.13.1

Gemfile

@@ -1,8 +1,6 @@
 source 'http://rubygems.org'
 gemspec
 
-gem 'slim', '1.1.0' # earliest verson supported
-
 gem 'sqlite3', :platform => :mri
 
 group :test do

lib/sidekiq/web.rb

@@ -1,8 +1,5 @@
 require 'yaml'
 require 'sinatra/base'
-require 'slim'
-
-raise "The Sidekiq Web UI requires slim 1.1.0 or greater.  You have slim v#{Slim::VERSION}" if Gem::Version.new(Slim::VERSION) < Gem::Version.new('1.1.0')
 
 require 'sidekiq'
 require 'sidekiq/api'
@@ -16,7 +13,6 @@ class Web < Sinatra::Base
     set :public_folder, Proc.new { "#{root}/assets" }
     set :views, Proc.new { "#{root}/views" }
     set :locales, Proc.new { "#{root}/locales" }
-    set :slim, :pretty => true
 
     helpers do
       def strings
@@ -164,12 +160,12 @@ def redis_keys
     end
 
     get "/workers" do
-      slim :index
+      erb :index
     end
 
     get "/queues" do
       @queues = Sidekiq::Queue.all
-      slim :queues
+      erb :queues
     end
 
     get "/queues/:name" do
@@ -178,7 +174,7 @@ def redis_keys
       @name = params[:name]
       (@current_page, @total_size, @messages) = page("queue:#{@name}", params[:page], @count)
       @messages = @messages.map {|msg| Sidekiq.load_json(msg) }
-      slim :queue
+      erb :queue
     end
 
     post "/reset" do
@@ -200,14 +196,14 @@ def redis_keys
       @count = (params[:count] || 25).to_i
       (@current_page, @total_size, @retries) = page("retry", params[:page], @count)
       @retries = @retries.map {|msg, score| [Sidekiq.load_json(msg), score] }
-      slim :retries
+      erb :retries
     end
 
     get "/retries/:key" do
       halt 404 unless params['key']
       @retry = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
       redirect "#{root_path}retries" if @retry.nil?
-      slim :retry
+      erb :retry
     end
 
     post '/retries' do
@@ -252,14 +248,14 @@ def redis_keys
       @count = (params[:count] || 25).to_i
       (@current_page, @total_size, @scheduled) = page("schedule", params[:page], @count)
       @scheduled = @scheduled.map {|msg, score| [Sidekiq.load_json(msg), score] }
-      slim :scheduled
+      erb :scheduled
     end
 
     get "/scheduled/:key" do
       halt 404 unless params['key']
       @job = Sidekiq::ScheduledSet.new.fetch(*parse_params(params['key'])).first
       redirect "#{root_path}scheduled" if @job.nil?
-      slim :scheduled_job_info
+      erb :scheduled_job_info
     end
 
     post '/scheduled' do
@@ -296,7 +292,7 @@ def redis_keys
       stats_history = Sidekiq::Stats::History.new((params[:days] || 30).to_i)
       @processed_history = stats_history.processed
       @failed_history = stats_history.failed
-      slim :dashboard
+      erb :dashboard
     end
 
     get '/dashboard/stats' do

myapp/Gemfile

@@ -14,7 +14,6 @@ gem 'sidekiq', :path => '..'
 gem 'capistrano'
 
 # sidekiq-web dependencies
-gem 'slim', '1.1.0'
 gem 'sinatra'
 
 gem 'shotgun'

sidekiq.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'celluloid', '>= 0.14.1'
   gem.add_dependency                  'json'
   gem.add_development_dependency      'sinatra'
-  gem.add_development_dependency      'slim', '>= 1.1.0'
   gem.add_development_dependency      'minitest', '~> 5'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'actionmailer'

web/views/_job_info.erb

@@ -0,0 +1,76 @@
+<header>
+  <h3><%= t('Job') %></h3>
+</header>
+
+<table class="table table-bordered table-striped">
+  <tbody>
+    <tr>
+      <th><%= t('Queue') %></th>
+      <td>
+        <a href="<%= root_path %>queues/<%= job['queue'] %>"><%= job['queue'] %></a>
+      </td>
+    </tr>
+    <tr>
+      <th><%= t('Class') %></th>
+      <td>
+        <code><%= job['class'] %></code>
+      </td>
+    </tr>
+    <tr>
+      <th><%= t('Arguments') %></th>
+      <td>
+        <code>
+          <!-- We don't want to truncate any job arguments when viewing a single job's status page -->
+          <div class="args-extended"><%= display_args(job['args'], nil) %></div>
+        </code>
+      </td>
+    </tr>
+    <tr>
+      <th>JID</th>
+      <td>
+        <code><%= job.jid %></code>
+      </td>
+    </tr>
+    <tr>
+      <th><%= t('Enqueued') %></th>
+      <td><%= relative_time(job.enqueued_at) %></td>
+    </tr>
+    <% unless retry_extra_items(job).empty? %>
+      <tr>
+        <th><%= t('Extras') %></th>
+        <td>
+          <code>
+            <%= retry_extra_items(job).inspect %>
+          </code>
+        </td>
+      </tr>
+    <% end %>
+    <% if type == :retry %>
+      <% if job['retry_count'] && job['retry_count'] > 0 %>
+        <tr>
+          <th><%= t('RetryCount') %></th>
+          <td><%= job['retry_count'] %></td>
+        </tr>
+        <tr>
+          <th><%= t('LastRetry') %></th>
+          <td><%= relative_time(job['retried_at'].is_a?(Numeric) ? Time.at(job['retried_at']) : Time.parse(job['retried_at'])) %></td>
+        </tr>
+      <% else %>
+        <tr>
+          <th><%= t('OriginallyFailed') %></th>
+          <td><%= relative_time(job['failed_at'].is_a?(Numeric) ? Time.at(job['failed_at']) : Time.parse(job['failed_at'])) %></td>
+        </tr>
+      <% end %>
+      <tr>
+        <th><%= t('NextRetry') %></th>
+        <td><%= relative_time(job.at) %></td>
+      </tr>
+    <% end %>
+    <% if type == :scheduled %>
+      <tr>
+        <th><%= t('Scheduled') %></th>
+        <td><%= relative_time(job.at) %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

web/views/_nav.erb

@@ -0,0 +1,23 @@
+<div class="navbar-inner">
+  <div class="container">
+    <a class="brand" href="<%= root_path %>"><%= Sidekiq::NAME %></a>
+    <ul class="nav">
+      <% tabs.each do |title, url| %>
+        <% if url == '' %>
+          <li class="<%= current_path == url ? 'active' : '' %>">
+            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+          </li>
+        <% else %>
+          <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
+            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+          </li>
+        <% end %>
+      <% end %>
+      <% custom_tabs.each do |title, url| %>
+        <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
+          <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

web/views/_paging.erb

@@ -0,0 +1,25 @@
+<% if @total_size > @count %>
+  <div class="pagination pagination-right">
+    <ul>
+      <li class="<%= 'disabled' if @current_page == 1 %>">
+        <a href="<%= url %>?page=1">«</a>
+      </li>
+      <% if @current_page > 1 %>
+        <li>
+          <a href="<%= url %>?page=<%= @current_page - 1 %>"><%= @current_page - 1 %></a>
+        </li>
+      <% end %>
+      <li class="disabled">
+        <a href="<%= url %>?page=<%= @current_page %>"><%= @current_page %></a>
+      </li>
+      <% if @total_size > @current_page * @count %>
+        <li>
+          <a href="<%= url %>?page=<%= @current_page + 1 %>"><%= @current_page + 1 %></a>
+        </li>
+      <% end %>
+      <li class="<%= 'disabled' if @total_size <= @current_page * @count %>">
+        <a href="<%= url %>?page=<%= (@total_size.to_f / @count).ceil %>">»</a>
+      </li>
+    </ul>
+  </div>
+<% end %>

web/views/_status.erb

@@ -0,0 +1,4 @@
+<span class="status">
+  <i class="status-sprite status-<%= current_status %>"></i>
+  <% t(current_status) %>
+</span>

web/views/_summary.erb

@@ -0,0 +1,26 @@
+<ul class="unstyled summary row">
+  <li class="processed span2">
+    <span class="count"><%= number_with_delimiter(stats.processed) %></span>
+    <span class="desc"><%= t('Processed') %></span>
+  </li>
+  <li class="failed span2">
+    <span class="count"><%= number_with_delimiter(stats.failed) %></span>
+    <span class="desc"><%= t('Failed') %></span>
+  </li>
+  <li class="busy span2">
+    <span class="count"><%= number_with_delimiter(workers_size) %></span>
+    <span class="desc"><%= t('Busy') %></span>
+  </li>
+  <li class="scheduled span2">
+    <span class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
+    <span class="desc"><%= t('Scheduled') %></span>
+  </li>
+  <li class="retries span2">
+    <span class="count"><%= number_with_delimiter(stats.retry_size) %></span>
+    <span class="desc"><%= t('Retries') %></span>
+  </li>
+  <li class="enqueued span2">
+    <span class="count"><%= number_with_delimiter(stats.enqueued) %></span>
+    <span class="desc"><%= t('Enqueued') %></span>
+  </li>
+</ul>