Switch to minitest and convert the server to a Rails engine to match new plugins structure for Resque-Web

.gitignore

@@ -15,3 +15,5 @@ nbproject
 
 .env
 .env.*
+
+/test/dummy/log/

lib/resque-scheduler.rb

@@ -1,4 +1,5 @@
 # vim:fileencoding=utf-8
 require_relative 'resque/scheduler'
+require 'resque/scheduler/engine'
 
 Resque.extend Resque::Scheduler::Extension

lib/resque/scheduler/engine.rb

@@ -0,0 +1,48 @@
+require 'resque_web'
+
+module ResqueWeb
+  module Plugins
+    module ResqueScheduler
+      class Engine < Rails::Engine
+        isolate_namespace ResqueWeb::Plugins::ResqueScheduler
+        paths['app'] << 'lib/resque/scheduler/engine/app'
+        paths['app/helpers'] << 'lib/resque/scheduler/engine/app/helpers'
+        paths['app/views'] << 'lib/resque/scheduler/engine/app/views'
+        paths['app/controllers'] << 'lib/resque/scheduler/'\
+          'engine/app/controllers'
+      end
+
+      Engine.routes do
+        get 'schedule', to: 'schedules#index', as: 'schedules'
+        post 'schedule/requeue', to: 'schedules#requeue', as: 'requeue'
+        post 'schedule/requeue_with_params',
+             to: 'schedules#requeue_with_params',
+             as: 'requeue_with_params'
+        delete 'schedule', to: 'schedules#destroy', as: 'schedule'
+
+        get 'delayed', to: 'delayed#index', as: 'delayed'
+        get 'delayed/jobs/:klass',
+            to: 'delayed#jobs_klass',
+            as: 'delayed_job_class'
+        post 'delayed/search', to: 'delayed#search', as: 'delayed_search'
+        get 'delayed/:timestamp', to: 'delayed#timestamp', as: 'timestamp'
+        post 'delayed/queue_now', to: 'delayed#queue_now', as: 'queue_now'
+        post 'delayed/cancel_now', to: 'delayed#cancel_now', as: 'cancel_now'
+        post '/delayed/clear', to: 'delayed#clear', as: 'clear'
+      end
+
+      def self.engine_path
+        '/scheduler'
+      end
+
+      def self.tabs
+        [
+          {
+            'schedule' => Engine.app.url_helpers.schedules_path,
+            'delayed' => Engine.app.url_helpers.delayed_path
+          }
+        ]
+      end
+    end
+  end
+end

lib/resque/scheduler/engine/app/controllers/resque_web/plugins/resque_scheduler/delayed_controller.rb

@@ -0,0 +1,100 @@
+module ResqueWeb
+  module Plugins
+    module ResqueScheduler
+      class DelayedController < ResqueWeb::ApplicationController
+        def index
+        end
+
+        def jobs_klass
+          klass = Resque::Scheduler::Util.constantize(params[:klass])
+          @args = JSON.load(URI.decode(params[:args]))
+          @timestamps = Resque.scheduled_at(klass, *@args)
+        rescue
+          @timestamps = []
+        end
+
+        def search
+          @jobs = find_job(params[:search])
+        end
+
+        def cancel_now
+          klass = Resque::Scheduler::Util.constantize(params['klass'])
+          timestamp = params['timestamp']
+          args = Resque.decode params['args']
+          Resque.remove_delayed_job_from_timestamp(timestamp, klass, *args)
+          redirect_to Engine.app.url_helpers.delayed_path
+        end
+
+        def clear
+          Resque.reset_delayed_queue
+          redirect_to Engine.app.url_helpers.delayed_path
+        end
+
+        def queue_now
+          timestamp = params['timestamp'].to_i
+          if timestamp > 0
+            Resque::Scheduler.enqueue_delayed_items_for_timestamp(timestamp)
+          end
+          redirect_to ResqueWeb::Engine.app.url_helpers.overview_path
+        end
+
+        def timestamp
+          @timestamp = params[:timestamp].to_i
+        end
+
+        protected
+
+        def find_job(worker)
+          worker = worker.downcase
+          results = working_jobs_for_worker(worker)
+
+          dels = delayed_jobs_for_worker(worker)
+          results += dels.select do |j|
+            j['class'].downcase.include?(worker) &&
+            j.merge!('where_at' => 'delayed')
+          end
+
+          Resque.queues.each do |queue|
+            queued = Resque.peek(queue, 0, Resque.size(queue))
+            queued = [queued] unless queued.is_a?(Array)
+            results += queued.select do |j|
+              j['class'].downcase.include?(worker) &&
+              j.merge!('queue' => queue, 'where_at' => 'queued')
+            end
+          end
+
+          results
+        end
+
+        def working_jobs_for_worker(worker)
+          [].tap do |results|
+            working = [*Resque.working]
+            work = working.select do |w|
+              w.job && w.job['payload'] &&
+              w.job['payload']['class'].downcase.include?(worker)
+            end
+            work.each do |w|
+              results += [
+                w.job['payload'].merge(
+                  'queue' => w.job['queue'], 'where_at' => 'working'
+                )
+              ]
+            end
+          end
+        end
+
+        def delayed_jobs_for_worker(_worker)
+          [].tap do |dels|
+            schedule_size = Resque.delayed_queue_schedule_size
+            Resque.delayed_queue_peek(0, schedule_size).each do |d|
+              Resque.delayed_timestamp_peek(
+                  d, 0, Resque.delayed_timestamp_size(d)).each do |j|
+                dels << j.merge!('timestamp' => d)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/resque/scheduler/engine/app/controllers/resque_web/plugins/resque_scheduler/schedules_controller.rb

@@ -0,0 +1,50 @@
+module ResqueWeb
+  module Plugins
+    module ResqueScheduler
+      class SchedulesController < ResqueWeb::ApplicationController
+        def index
+          Resque.reload_schedule! if Resque::Scheduler.dynamic
+        end
+
+        def destroy
+          if Resque::Scheduler.dynamic
+            job_name = params['job_name'] || params[:job_name]
+            Resque.remove_schedule(job_name)
+          end
+          redirect_to Engine.app.url_helpers.schedules_path
+        end
+
+        def requeue
+          @job_name = params['job_name'] || params[:job_name]
+          config = Resque.schedule[@job_name]
+          @parameters = config['parameters'] || config[:parameters]
+          if @parameters
+            render 'requeue-params'
+          else
+            Resque::Scheduler.enqueue_from_config(config)
+            redirect_to ResqueWeb::Engine.app.url_helpers.overview_path
+          end
+        end
+
+        def requeue_with_params
+          job_name = params['job_name'] || params[:job_name]
+          config = Resque.schedule[job_name]
+          # Build args hash from post data (removing the job name)
+          submitted_args = params.reject do |key, _value|
+            %w(job_name action controller).include?(key)
+          end
+
+          # Merge constructed args hash with existing args hash for
+          # the job, if it exists
+          config_args = config['args'] || config[:args] || {}
+          config_args = config_args.merge(submitted_args)
+
+          # Insert the args hash into config and queue the resque job
+          config = config.merge('args' => config_args)
+          Resque::Scheduler.enqueue_from_config(config)
+          redirect_to ResqueWeb::Engine.app.url_helpers.overview_path
+        end
+      end
+    end
+  end
+end

lib/resque/scheduler/engine/app/helpers/resque_web/plugins/resque_scheduler/delayed_helper.rb

@@ -0,0 +1,11 @@
+module ResqueWeb
+  module Plugins
+    module ResqueScheduler
+      module DelayedHelper
+        def format_time(t)
+          t.strftime('%Y-%m-%d %H:%M:%S %z')
+        end
+      end
+    end
+  end
+end

lib/resque/scheduler/engine/app/helpers/resque_web/plugins/resque_scheduler/schedules_helper.rb

@@ -0,0 +1,53 @@
+module ResqueWeb
+  module Plugins
+    module ResqueScheduler
+      module SchedulesHelper
+        def scheduled_in_this_env?(name)
+          return true if Resque.schedule[name]['rails_env'].nil?
+          rails_env(name).split(/[\s,]+/).include?(Resque::Scheduler.env)
+        end
+
+        def rails_env(name)
+          Resque.schedule[name]['rails_env']
+        end
+
+        def schedule_interval_every(every)
+          every = [*every]
+          s = 'every: ' << every.first
+
+          return s unless every.length > 1
+
+          s << ' ('
+          meta = every.last.map do |key, value|
+            "#{key.to_s.gsub(/_/, ' ')} #{value}"
+          end
+          s << meta.join(', ') << ')'
+        end
+
+        def schedule_interval(config)
+          if config['every']
+            schedule_interval_every(config['every'])
+          elsif config['cron']
+            'cron: ' + config['cron'].to_s
+          else
+            'Not currently scheduled'
+          end
+        end
+
+        def schedule_class(config)
+          if config['class'].nil? && !config['custom_job_class'].nil?
+            config['custom_job_class']
+          else
+            config['class']
+          end
+        end
+
+        def queue_from_class_name(class_name)
+          Resque.queue_from_class(
+              Resque::Scheduler::Util.constantize(class_name)
+          )
+        end
+      end
+    end
+  end
+end

lib/resque/scheduler/engine/app/views/resque_web/plugins/resque_scheduler/delayed/_next_more.erb

@@ -0,0 +1,23 @@
+<% # per_page was added in 1.23.1; gems which add to resque-server don't pass that variable along so it would crash  %>
+<% # without a default value  %>
+<% per_page ||= 20 %>
+<% if start - per_page >= 0 || start + per_page <= size %>
+  <p class='pagination'>
+    <% if start + per_page <= size %>
+      <a href="<%= current_page %>?start=<%= start + per_page %>" class='more'>&laquo;
+        Next</a>
+    <% end %>
+
+    <% (size / per_page.to_f - 1).ceil.downto(0).each do |page_num| %>
+      <% if start == page_num * per_page %>
+        <%= page_num %>
+      <% else %>
+        <a href="<%= current_page %>?start=<%= page_num * per_page %>"> <%= page_num %></a>
+      <% end %>
+    <% end %>
+
+    <% if start - per_page >= 0 %>
+      <a href="<%= current_page %>?start=<%= start - per_page %>" class='less'>Previous &raquo;</a>
+    <% end %>
+  </p>
+<% end %>

lib/resque/scheduler/server/views/search_form.erb → lib/resque/scheduler/engine/app/views/resque_web/plugins/resque_scheduler/delayed/_search_form.erb

@@ -1,4 +1,4 @@
-<form method="POST" action="<%= u 'delayed/search' %>">
+<form method="POST" action="<%= delayed_search_path %>">
   <input type='input' name='search' value="<%= params[:search] %>"/>
   <input type='submit' value='Search'/>
 </form>

lib/resque/scheduler/server/views/delayed.erb → lib/resque/scheduler/engine/app/views/resque_web/plugins/resque_scheduler/delayed/index.erb

@@ -1,7 +1,7 @@
 <h1>Delayed Jobs</h1>
-<%- size = resque.delayed_queue_schedule_size %>
+<%- size = Resque.delayed_queue_schedule_size %>
 
-<%= scheduler_view :search_form, layout: false %>
+<%= render partial: 'search_form' %>
 
 <p class='intro'>
   This list below contains the timestamps for scheduled delayed jobs.
@@ -12,7 +12,7 @@
   Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%= size %></b> timestamps
 </p>
 
-<table>
+<table class="table table-bordered">
   <tr>
     <th></th>
     <th>Timestamp</th>
@@ -21,28 +21,28 @@
     <th>Args</th>
     <th>All schedules</th>
   </tr>
-  <% resque.delayed_queue_peek(start, 20).each do |timestamp| %>
+  <% Resque.delayed_queue_peek(start, 20).each do |timestamp| %>
     <tr>
       <td>
-        <form action="<%= u "/delayed/queue_now" %>" method="post">
+        <form action="<%= queue_now_path %>" method="post">
           <input type="hidden" name="timestamp" value="<%= timestamp.to_i %>">
-          <input type="submit" value="Queue now">
+          <input type="submit" value="Queue now" class="btn btn-default">
         </form>
       </td>
-      <td><a href="<%= u "delayed/#{timestamp}" %>"><%= format_time(Time.at(timestamp)) %></a></td>
-      <td><%= delayed_timestamp_size = resque.delayed_timestamp_size(timestamp) %></td>
-      <% job = resque.delayed_timestamp_peek(timestamp, 0, 1).first %>
+      <td><a href="<%= delayed_path timestamp: timestamp %>"><%= format_time(Time.at(timestamp)) %></a></td>
+      <td><%= delayed_timestamp_size = Resque.delayed_timestamp_size(timestamp) %></td>
+      <% job = Resque.delayed_timestamp_peek(timestamp, 0, 1).first %>
       <td>
         <% if job && delayed_timestamp_size == 1 %>
           <%= h(job['class']) %>
         <% else %>
-          <a href="<%= u "delayed/#{timestamp}" %>">see details</a>
+          <a href="<%= delayed_path timestamp: timestamp %>">see details</a>
         <% end %>
       </td>
       <td><%= h(job['args'].inspect) if job && delayed_timestamp_size == 1 %></td>
       <td>
         <% if job %>
-          <a href="<%=u URI("/delayed/jobs/#{job['class']}?args=" + URI.encode(job['args'].to_json)) %>">All schedules</a>
+          <a href="<%= delayed_job_class_path klass: job['class'], args: URI.encode(job['args'].to_json) %>">All schedules</a>
         <% end %>
       </td>
     </tr>
@@ -51,9 +51,10 @@
 
 <% if size > 0 %>
   <br>
-  <form method="POST" action="<%=u 'delayed/clear'%>" class='clear-delayed'>
+  <form method="POST" action="<%= clear_path %>" class='clear-delayed'>
     <input type='submit' name='' value='Clear Delayed Jobs' />
   </form>
 <% end %>
 
-<%= partial :next_more, :start => start, :size => size %>
+<%= render partial: 'next_more', locals: { :start => start, :size => size } %>
+

lib/resque/scheduler/engine/app/views/resque_web/plugins/resque_scheduler/delayed/jobs_klass.erb

@@ -0,0 +1,20 @@
+<h1>Delayed jobs scheduled for <%= params[:klass] %> (<%= @args %>)</h1>
+
+<table class='jobs'>
+  <tr>
+    <th>Timestamp</th>
+  </tr>
+
+  <% @timestamps.each do |t| %>
+    <tr>
+      <td>
+        <%= Time.at(t) %>
+      </td>
+    </tr>
+  <% end %>
+  <% if @timestamps.empty? %>
+    <tr>
+      <td class='no-data'>There are no such jobs scheduled.</td>
+    </tr>
+  <% end %>
+</table>