Support jQuery DataTable library

.gitignore

@@ -28,6 +28,7 @@ vendor/ruby
 Vagrantfile
 .vagrant
 .idea
+.dccache
 
 # wwtd
 gemfiles/.bundle

CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+## 0.0.19
+
+* Fix bugs on production.
+
+## 0.0.18
+
+* Fix bugs.
+
+## 0.0.17
+
+* Fix bugs.
+
+## 0.0.16
+
+* Fix bugs.
+
+## 0.0.15
+
+* Add CHANGELOG file.
+* Update version.
+
+## 0.0.14
+
+* Support jQuery DataTable library.

app/assets/javascripts/resque_web/resque_web_common.js

@@ -0,0 +1,14 @@
+var ResqueWebCommon = function() {
+  var initPopover = function() {
+    $('[data-toggle="popover"]').popover();
+  }
+
+  return {
+    init: function() {
+      initPopover();
+    },
+    initPopover: function() {
+      initPopover();
+    }
+  }
+}();

app/helpers/resque_web/application_helper.rb

@@ -1,19 +1,21 @@
 module ResqueWeb
   module ApplicationHelper
-
     PER_PAGE = 20
 
     def tabs
-      t = {'overview' => ResqueWeb::Engine.app.url_helpers.overview_path,
-       'working'  => ResqueWeb::Engine.app.url_helpers.working_index_path,
-       'failures' => ResqueWeb::Engine.app.url_helpers.failures_path,
-       'queues' => ResqueWeb::Engine.app.url_helpers.queues_path,
-       'workers' => ResqueWeb::Engine.app.url_helpers.workers_path,
-       'stats' => ResqueWeb::Engine.app.url_helpers.stats_path
+      t = {
+        'overview' => ResqueWeb::Engine.app.url_helpers.overview_path,
+        'working' => ResqueWeb::Engine.app.url_helpers.working_index_path,
+        'failures' => ResqueWeb::Engine.app.url_helpers.failures_path,
+        'queues' => ResqueWeb::Engine.app.url_helpers.queues_path,
+        'workers' => ResqueWeb::Engine.app.url_helpers.workers_path,
+        'stats' => ResqueWeb::Engine.app.url_helpers.stats_path
       }
+
       ResqueWeb::Plugins.plugins.each do |p|
         p.tabs.each { |tab| t.merge!(tab) }
       end
+
       t
     end
 
@@ -40,30 +42,35 @@ def current_subtab?(name)
     end
 
     def pagination(options = {})
-      start    = options[:start] || 1
+      start = options[:start] || 1
       per_page = options[:per_page] || PER_PAGE
-      total    = options[:total] || 0
+      total = options[:total] || 0
       return if total < per_page
 
-      markup = ""
+      markup = ''
+
       if start - per_page >= 0
-        markup << link_to(raw("&laquo; less"), params.permit!.merge(:start => start - per_page), :class => 'btn less')
+        new_params = request.query_parameters.merge(start: start - per_page)
+        new_path = "#{request.path}?#{new_params.to_query}"
+        markup << link_to(raw('&laquo; less'), new_path, class: 'btn less')
       end
 
       if start + per_page <= total
-        markup << link_to(raw("more &raquo;"), params.permit!.merge(:start => start + per_page), :class => 'btn more')
+        new_params = request.query_parameters.merge(start: start + per_page)
+        new_path = "#{request.path}?#{new_params.to_query}"
+        markup << link_to(raw('more &raquo;'), new_path, class: 'btn more')
       end
 
-      content_tag :p, raw(markup), :class => 'pagination'
+      content_tag :p, raw(markup), class: 'pagination'
     end
 
-    def poll(polling=false)
+    def poll(polling = false)
       if polling
-        text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}".html_safe
+        text = "Last Updated: #{Time.now.strftime('%H:%M:%S')}".html_safe
       else
         text = "<a href='#{h(request.path)}' rel='poll'>Live Poll</a>".html_safe
       end
-      content_tag :p, text, :class => 'poll'
+      content_tag :p, text, class: 'poll'
     end
   end
 end

app/views/layouts/resque_web/application.html.erb

@@ -70,8 +70,8 @@
 
 <footer id="footer">
   <div class="container">
-    <p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%=Resque::Version%></p>
-    <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis_id%></p>
+    <p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%= Resque::VERSION %></p>
+    <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%= Resque.redis_id %></p>
   </div>
 </footer>
 

app/views/resque_web/failures/index.html.erb

@@ -8,7 +8,7 @@
   <%= form_tag(destroy_all_failures_path(queue: params[:queue]), method: :delete) do %>
     <%= submit_tag "Clear #{failure_queue_name} Jobs", class: 'btn btn-danger', data: { confirm: "Are you sure you want to clear ALL #{failure_queue_name.downcase} jobs?" } %>
     <% if failure_size > failure_per_page %>
-      <%= link_to "Last page &raquo;".html_safe, { start: (failure_size - failure_per_page) }, class: 'btn' %>
+      <%= link_to "Last page &raquo;".html_safe, failures_path(start: (failure_size - failure_per_page)), class: 'btn' %>
     <% end %>
   <% end %>
   <%= form_tag(retry_all_failures_path(queue: params[:queue]), method: :put) do %>

config/routes.rb

@@ -2,23 +2,26 @@
 id_pattern = /[^\/]+/
 
 ResqueWeb::Engine.routes.draw do
-
   ResqueWeb::Plugins.plugins.each do |p|
     mount p::Engine => p.engine_path
   end
 
-  resource  :overview,  :only => [:show], :controller => :overview
-  resources :working,   :only => [:index]
-  resources :queues,    :only => [:index,:show,:destroy], :constraints => {:id => id_pattern} do
+  resource  :overview, only: [:show], controller: :overview
+  resources :working, only: [:index]
+
+  resources :queues, only: [:index, :show, :destroy], constraints: { id: id_pattern } do
     member do
       put 'clear'
     end
   end
-  resources :workers,   :only => [:index,:show], :constraints => {:id => id_pattern}
-  resources :failures,  :only => [:show,:index,:destroy] do
+
+  resources :workers, only: [:index, :show], constraints: { id: id_pattern }
+
+  resources :failures, only: [:show, :index, :destroy] do
     member do
       put 'retry'
     end
+
     collection do
       put 'retry_all'
       delete 'destroy_all'
@@ -29,8 +32,7 @@
   get '/stats/resque' => 'stats#resque'
   get '/stats/redis' => 'stats#redis'
   get '/stats/keys' => 'stats#keys'
-  get '/stats/keys/:id' => 'stats#keys', :constraints => { :id => id_pattern }, as: :keys_statistic
-
-  root :to => 'overview#show'
+  get '/stats/keys/:id' => 'stats#keys', constraints: { id: id_pattern }, as: :keys_statistic
 
+  root to: 'overview#show'
 end

lib/resque_web/version.rb

@@ -1,3 +1,3 @@
 module ResqueWeb
-  VERSION = "0.0.12"
+  VERSION = "0.0.19"
 end