resque-job_history 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 611450a862256e5adff163fdc1932b60ccb780af
-  data.tar.gz: 1873bbabe72e49820c3d43697fac5940840de034
+  metadata.gz: 12b7b70a26083af7bc43e79071c56a7b1a9b1c7a
+  data.tar.gz: f34d0ea2e6a27e9aa272051c53b1c40b01550e1a
 SHA512:
-  metadata.gz: d38f13b928d53a355148ad45e53cbf2205589ed8078b50220d40aac6aa29045369279880a5da339dde7820b3c32edf1aeb266c5788e158cee1229f0133b79da5
-  data.tar.gz: d0527dca6d0b41b1e9126dda7f27ef61b92d26b62f67884b5453cee72b93c80be2547c16d717235312737872e9e06852a5b1c0435b54236a9656e6d588fb869a
+  metadata.gz: f8418efa6f85eafbd533c0a4592ff671d7c462c926a4071ee292cc6be468fcdd027ab6f1b2f85e790ef5dced7ee97ab54f56b94030bf414e977bcb4bb20f727d
+  data.tar.gz: cdcc689db81b7131d7c27e09b8890d39cee88f57e6be6330fae1234bfedf4d7f66d68f85d2731ef50fffa0cd9d548fbba6c6b78b86dd1cbf6f32f40626534532

data/lib/resque/job_history_server.rb

@@ -41,7 +41,7 @@ module Resque
         job_history_params(base)
 
         base.class_eval do
-          get "/job history" do
+          get "/job%20history" do
             set_job_history_params
 
             erb File.read(Resque::JobHistoryServer.erb_path("job_history.erb"))
@@ -67,7 +67,7 @@ module Resque
         finished_page_params(base)
 
         base.class_eval do
-          get "/job history/job_class_details" do
+          get "/job%20history/job_class_details" do
             set_class_details_params
 
             erb File.read(Resque::JobHistoryServer.erb_path("job_class_details.erb"))
@@ -107,7 +107,7 @@ module Resque
 
       def job_details(base)
         base.class_eval do
-          get "/job history/job_details" do
+          get "/job%20history/job_details" do
             @job_class_name = params[:class_name]
             @job_id         = params[:job_id]
 
@@ -118,7 +118,7 @@ module Resque
 
       def linear_list(base)
         base.class_eval do
-          get "/job history/linear_history" do
+          get "/job%20history/linear_history" do
             @page_num  = (params[:page_num] || 1).to_i
             @page_size = (params[:page_size] ||
                 Resque::Plugins::JobHistory::HistoryDetails.linear_page_size).to_i
@@ -143,11 +143,14 @@ module Resque
         retry_job(base)
         delete_job(base)
         cancel_job(base)
+        search_all(base)
+        search_job(base)
+        search_linear_history(base)
       end
 
       def cancel_job(base)
         base.class_eval do
-          post "/job history/cancel_job" do
+          post "/job%20history/cancel_job" do
             Resque::Plugins::JobHistory::Job.new(params[:class_name], params[:job_id]).cancel
 
             redirect u("job history/job_details?#{{ class_name: params[:class_name],
@@ -158,7 +161,7 @@ module Resque
 
       def delete_job(base)
         base.class_eval do
-          post "/job history/delete_job" do
+          post "/job%20history/delete_job" do
             Resque::Plugins::JobHistory::Job.new(params[:class_name], params[:job_id]).purge
 
             redirect u("job history/job_class_details?#{{ class_name: params[:class_name] }.to_param}")
@@ -168,7 +171,7 @@ module Resque
 
       def retry_job(base)
         base.class_eval do
-          post "/job history/retry_job" do
+          post "/job%20history/retry_job" do
             Resque::Plugins::JobHistory::Job.new(params[:class_name], params[:job_id]).retry
 
             redirect u("job history/job_class_details?#{{ class_name: params[:class_name] }.to_param}")
@@ -178,7 +181,7 @@ module Resque
 
       def purge_class(base)
         base.class_eval do
-          post "/job history/purge_class" do
+          post "/job%20history/purge_class" do
             Resque::Plugins::JobHistory::Cleaner.purge_class(params[:class_name])
 
             redirect u("job history")
@@ -188,7 +191,7 @@ module Resque
 
       def purge_all(base)
         base.class_eval do
-          post "/job history/purge_all" do
+          post "/job%20history/purge_all" do
             Resque::Plugins::JobHistory::Cleaner.purge_all_jobs
 
             redirect u("job history")
@@ -198,13 +201,49 @@ module Resque
 
       def purge_linear_history(base)
         base.class_eval do
-          post "/job history/purge_linear_history" do
+          post "/job%20history/purge_linear_history" do
             Resque::Plugins::JobHistory::Cleaner.purge_linear_history
 
             redirect u("job history")
           end
         end
       end
+
+      def search_all(base)
+        base.class_eval do
+          post "/job%20history/search_all" do
+            @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
+
+            @job_search.search
+
+            erb File.read(Resque::JobHistoryServer.erb_path("search_results.erb"))
+          end
+        end
+      end
+
+      def search_job(base)
+        base.class_eval do
+          post "/job%20history/search_job" do
+            @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
+
+            @job_search.search
+
+            erb File.read(Resque::JobHistoryServer.erb_path("search_results.erb"))
+          end
+        end
+      end
+
+      def search_linear_history(base)
+        base.class_eval do
+          post "/job%20history/search_linear_history" do
+            @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
+
+            @job_search.search
+
+            erb File.read(Resque::JobHistoryServer.erb_path("search_results.erb"))
+          end
+        end
+      end
     end
 
     Resque::Server.tabs << "Job History"

data/lib/resque/plugins/job_history/job.rb

@@ -54,6 +54,8 @@ module Resque
 
           record_job_start(*args)
           record_num_jobs(num_jobs)
+
+          self
         end
 
         def finish
@@ -63,6 +65,8 @@ module Resque
           running_jobs.remove_job(job_id)
 
           reset
+
+          self
         end
 
         def failed(exception)

data/lib/resque/plugins/job_history/job_search.rb

@@ -0,0 +1,238 @@
+# frozen_string_literal: true
+# rubocop:disable ClassLength
+
+module Resque
+  module Plugins
+    module JobHistory
+      # This class searches through jobs looking for one which matches the passed in criteria.
+      class JobSearch
+        ALL_ATTRIBUTES = [:search_type,
+                          :job_class_name,
+                          :search_for,
+                          :regex_search,
+                          :case_insensitive,
+                          :last_class_name,
+                          :last_job_id,
+                          :last_job_group].freeze
+
+        SEARCH_TYPES = %w(search_all search_job search_linear_history).freeze
+
+        DEFAULT_SEARCH_TIMEOUT = 10.seconds
+
+        attr_reader(*ALL_ATTRIBUTES)
+
+        def initialize(params)
+          params = params.with_indifferent_access
+          ALL_ATTRIBUTES.each do |attribute|
+            instance_variable_set("@#{attribute}", params[attribute]) if params.key?(attribute)
+          end
+
+          raise ArgumentError, "invalid search_type" unless SEARCH_TYPES.include?(search_type)
+        end
+
+        def retry_search_settings(all_settings)
+          settings = search_settings(all_settings)
+
+          [:last_class_name,
+           :last_job_id,
+           :last_job_group].each do |continue_setting|
+            settings.delete(continue_setting)
+          end
+
+          settings
+        end
+
+        def search_settings(all_settings)
+          settings = ALL_ATTRIBUTES.dup
+
+          unless all_settings
+            settings.delete :search_for
+            settings.delete :regex_search
+            settings.delete :case_insensitive
+          end
+
+          settings.each_with_object({}) do |setting, hash|
+            hash[setting] = send(setting)
+
+            hash.delete(setting) if hash[setting].blank?
+          end
+        end
+
+        def search
+          end_search?
+
+          send search_type
+        end
+
+        def class_results
+          @class_results ||= []
+        end
+
+        def run_results
+          @run_results ||= []
+        end
+
+        def more_records?
+          last_class_name || last_job_id
+        end
+
+        def search_timeout
+          DEFAULT_SEARCH_TIMEOUT
+        end
+
+        private
+
+        def search_end_time
+          @search_end_time ||= search_timeout.from_now
+        end
+
+        def end_search?
+          Time.now > search_end_time
+        end
+
+        def search_all
+          job_list    = Resque::Plugins::JobHistory::JobList.new
+          search_jobs = job_list.job_classes.sort.map { |class_name| job_list.job_details(class_name) }
+
+          search_class_names(search_jobs) unless last_class_name && last_job_id
+
+          return if end_search? && last_class_name.present? && !last_job_id
+
+          search_all_class_jobs(search_jobs)
+        end
+
+        def search_all_class_jobs(search_jobs)
+          search_jobs = remove_searched_job_classes(search_jobs)
+
+          search_jobs.each do |job_class|
+            search_job_class job_class
+
+            @last_class_name = job_class.class_name
+
+            break if end_search? && last_job_id.present?
+          end
+
+          @last_class_name = nil if search_jobs.blank? || !end_search? || last_job_id.blank?
+        end
+
+        def search_job
+          job_class = Resque::Plugins::JobHistory::HistoryDetails.new(job_class_name)
+
+          search_job_class(job_class)
+        end
+
+        def search_linear_history
+          job_class = Resque::Plugins::JobHistory::JobList.new
+
+          search_class_jobs(job_class.linear_jobs.jobs, :linear_jobs)
+        end
+
+        def search_regex
+          @search_regex = if search_for.blank?
+                            search_for
+                          elsif regex_search
+                            Regexp.new(search_for, case_insensitive)
+                          elsif case_insensitive
+                            search_for.downcase
+                          else
+                            search_for
+                          end
+        end
+
+        def validate_string(value)
+          if search_regex.blank?
+            value == "[]"
+          elsif regex_search
+            value.match(search_regex)
+          elsif case_insensitive
+            value.downcase.include?(search_regex)
+          else
+            value.include?(search_regex)
+          end
+        end
+
+        def search_class_names(search_jobs)
+          search_jobs = remove_searched_job_classes(search_jobs)
+
+          search_jobs.each do |job_class|
+            class_results << job_class if validate_string(job_class.class_name)
+            @last_class_name = job_class.class_name
+
+            break if end_search?
+          end
+
+          @last_class_name = nil if search_jobs.blank? || !end_search?
+        end
+
+        def remove_searched_job_classes(search_jobs)
+          last_index = if last_class_name.present?
+                         job_index = search_jobs.
+                             index { |job_class| job_class.class_name == last_class_name } ||
+                             search_jobs.length
+
+                         job_index += 1 if last_job_id.blank?
+
+                         job_index
+                       else
+                         0
+                       end
+
+          if last_index.positive?
+            Array.wrap(search_jobs[last_index..-1])
+          else
+            search_jobs
+          end
+        end
+
+        def search_job_class(job_class)
+          if last_job_group.blank? || last_job_group == :running_jobs
+            search_class_jobs(job_class.running_jobs.jobs, :running_jobs)
+
+            return unless !end_search? || last_job_id.blank?
+          end
+
+          search_class_jobs(job_class.finished_jobs.jobs, :finished_jobs)
+        end
+
+        def search_class_jobs(job_list, job_group)
+          return if last_job_group.present? && last_job_group.to_s != job_group.to_s
+
+          job_list = remove_searched_jobs(job_list, job_group)
+
+          @last_job_group = job_group
+
+          add_class_job_results(job_list)
+
+          return if job_list.present? && end_search?
+
+          @last_job_id    = nil
+          @last_job_group = nil
+        end
+
+        def add_class_job_results(job_list)
+          job_list.each do |job|
+            run_results << job if validate_string(Resque.encode(job.args))
+            @last_job_id = job.job_id
+
+            break if end_search?
+          end
+        end
+
+        def remove_searched_jobs(job_list, job_group)
+          last_index = if last_job_id.present? && job_group == last_job_group
+                         (job_list.index { |job_run| job_run.job_id == last_job_id } ||
+                             job_list.length) + 1
+                       else
+                         0
+                       end
+
+          if last_index.positive?
+            Array.wrap(job_list[last_index..-1])
+          else
+            job_list
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resque/plugins/version.rb

@@ -3,7 +3,7 @@
 module Resque
   module Plugins
     module JobHistory
-      VERSION = "0.0.10"
+      VERSION = "0.0.11"
     end
   end
 end

data/lib/resque/server/public/job_history.css

@@ -36,3 +36,21 @@
 .job_history_error {
     background-color: lightcoral;
 }
+
+.job_history_linear_history_div {
+    margin-top: 5px;
+    float:      left;
+}
+
+#job_history_search_div {
+    float:         right;
+    margin-bottom: 10px;
+}
+
+#job_history_search_div form {
+    margin-top: 0px;
+}
+
+.job_history_reset {
+    clear: both;
+}

data/lib/resque/server/views/_job_list_table.erb

@@ -0,0 +1,50 @@
+<div class="table_container">
+  <table>
+    <tr>
+      <% if show_class %>
+        <th>Class</th>
+      <% end %>
+      <th>Started</th>
+      <th>Duration</th>
+      <th>Parameters</th>
+      <th>Error</th>
+    </tr>
+    <% jobs.each do |job_details| %>
+      <tr<%= job_details.succeeded? ? "" : " class=\"job_history_error\"" %>>
+        <% if show_class %>
+          <td>
+            <a href="<%= u("job history/job_class_details") %>?<%=
+              { class_name: job_details.class_name }.to_param %>">
+              <%= job_details.class_name %>
+            </a>
+          </td>
+        <% end %>
+        <td>
+          <a href="<%= u("job history/job_details") %>?class_name=<%=
+            job_details.class_name %>&job_id=<%= job_details.job_id %>">
+            <% if job_details.start_time %>
+              <%= time_ago_in_words(job_details.start_time) %> ago
+              (<%= job_details.start_time %>)
+            <% else %>
+              Error - missing start time
+            <% end %>
+          </a>
+        </td>
+        <td>
+          <% if job_details.start_time %>
+            <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
+            <% if job_details.finished? %>
+              (<%= job_details.end_time %>)
+            <% end %>
+          <% end %>
+        </td>
+        <td>
+          <pre><code><%= "".html_safe + job_details.args.to_yaml %></code></pre>
+        </td>
+        <td>
+          <%= job_details.error %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/lib/resque/server/views/_job_summary_rows.erb

@@ -0,0 +1,44 @@
+<% summary_rows.each do |class_info| %>
+  <tr<%= class_info.last_run && !class_info.last_run.succeeded? ? " class=\"job_history_error\"" : "" %>>
+    <td>
+      <a href="<%= u("job history") %>/job_class_details?class_name=<%= class_info.class_name %>">
+        <%= class_info.class_name %>
+      </a>
+    </td>
+    <td>
+      <%= class_info.num_running_jobs.to_i %>
+    </td>
+    <td>
+      <%= class_info.total_run_jobs.to_i %>
+    </td>
+    <td>
+      <%= class_info.total_finished_jobs.to_i %>
+    </td>
+    <td>
+      <%= class_info.total_failed_jobs.to_i %>
+    </td>
+    <td>
+      <% if class_info.last_run && class_info.last_run.start_time %>
+        <%= time_ago_in_words(class_info.last_run.start_time) %> ago
+        (<%= class_info.last_run.start_time %>)
+      <% end %>
+    </td>
+    <td>
+      <% if class_info.last_run %>
+        <% if class_info.last_run.finished? %>
+          <%= distance_of_time_in_words(class_info.last_run.start_time, class_info.last_run.end_time) %>
+          (<%= class_info.last_run.end_time %>)
+        <% else %>
+          Still running...
+        <% end %>
+      <% end %>
+    </td>
+    <td>
+      <% if class_info.last_run && !class_info.last_run.succeeded? %>
+        No
+      <% else %>
+        Yes
+      <% end %>
+    </td>
+  </tr>
+<% end %>

data/lib/resque/server/views/_jobs_list.erb

@@ -12,45 +12,8 @@
                     secondary_page_num:  secondary_page_num,
                     secondary_page_size: secondary_page_size }) %>
 
-  <div class="table_container">
-    <table>
-      <tr>
-        <th>Started</th>
-        <th>Duration</th>
-        <th>Parameters</th>
-        <th>Error</th>
-      </tr>
-      <% jobs.each do |job_details| %>
-        <tr<%= job_details.succeeded? ? "" : " class=\"job_history_error\"" %>>
-          <td>
-            <a href="<%= u("job history/job_details") %>?class_name=<%=
-              job_details.class_name %>&job_id=<%= job_details.job_id %>">
-              <% if job_details.start_time %>
-                <%= time_ago_in_words(job_details.start_time) %> ago
-                (<%= job_details.start_time %>)
-              <% else %>
-                Error - missing start time
-              <% end %>
-            </a>
-          </td>
-          <td>
-            <% if job_details.start_time %>
-              <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
-              <% if job_details.finished? %>
-                (<%= job_details.end_time %>)
-              <% end %>
-            <% end %>
-          </td>
-          <td>
-            <pre><code><%= "".html_safe + job_details.args.to_yaml %></code></pre>
-          </td>
-          <td>
-            <%= job_details.error %>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-  </div>
+  <%= erb(File.read(Resque::JobHistoryServer.erb_path("_job_list_table.erb")),
+          locals: { jobs: jobs, show_class: false }) %>
 
   <%= erb(File.read(Resque::JobHistoryServer.erb_path("_job_pagination.erb")),
           locals: { history_list:        history_list,

data/lib/resque/server/views/_search_form.erb

@@ -0,0 +1,14 @@
+<div id="job_history_search_div">
+  <form method="POST" action="<%= u("job history/#{job_search.search_type}") %>">
+    <% job_search.retry_search_settings(false).each do |setting_name, setting_value| %>
+      <input type="hidden" name="<%= setting_name %>" value="<%= setting_value %>"/>
+    <% end %>
+
+    <input type="checkbox" name="regex_search" <%= job_search.regex_search ? "checked" : "" %> value="true"/>
+    Regex
+    <input type="checkbox" name="case_insensitive" <%= job_search.case_insensitive ? "checked" : "" %> value="true"/>
+    Case Insensitive
+    <input type="text" size="50" name="search_for" value="<%= job_search.search_for %>"/>
+    <input type="submit" value="Search"/>
+  </form>
+</div>

data/lib/resque/server/views/job_class_details.erb

@@ -6,11 +6,19 @@
 <% history = Resque::Plugins::JobHistory::HistoryDetails.new(@job_class_name) %>
 <% class_info = job_list.job_details(@job_class_name) %>
 
-<p>
-  <a href="<%= u("job history") %>">
-    Job History
-  </a>
-</p>
+<div>
+  <div class="job_history_linear_history_div">
+    <a href="<%= u("job history") %>">
+      Job History
+    </a>
+  </div>
+
+  <% job_search = Resque::Plugins::JobHistory::JobSearch.
+      new(search_type: "search_job", job_class_name: @job_class_name) %>
+  <%= erb(File.read(Resque::JobHistoryServer.erb_path("_search_form.erb")),
+          locals: { job_search: job_search }) %>
+</div>
+<div class="job_history_reset"/>
 
 <div class="table_container">
   <table>
@@ -106,10 +114,15 @@
 <br/>
 
 <% if Resque::Plugins::JobHistory::Cleaner.similar_name?(@job_class_name) %>
-  This class cannot be purged because of another class with a similar name.  The other class must
-  be purged before this one can be safely purged.
+  <div>
+    <p>
+      This class cannot be purged because of another class with a similar name. The other class must
+      be purged before this one can be safely purged.
+    </p>
+  </div>
 <% else %>
   <form method="POST" action="<%= u("job history/purge_class") %>?<%= { class_name: @job_class_name }.to_param %>">
     <input type="submit" name="" value="Purge all histories for <%= @job_class_name %>"/>
   </form>
 <% end %>
+<div class="job_history_reset"/>

data/lib/resque/server/views/job_details.erb

@@ -85,3 +85,4 @@
     <input type="submit" name="" value="Retry this run"/>
   </form>
 <% end %>
+<div class="job_history_reset"/>

data/lib/resque/server/views/job_history.erb

@@ -4,11 +4,19 @@
 
 <% job_list = Resque::Plugins::JobHistory::JobList.new %>
 
-<p>
-  <a href="<%= u("job history/linear_history") %>">
-    Linear History
-  </a>
-</p>
+<div>
+  <div class="job_history_linear_history_div">
+    <a href="<%= u("job history/linear_history") %>">
+      Linear History
+    </a>
+  </div>
+
+  <% job_search = Resque::Plugins::JobHistory::JobSearch.
+      new(search_type: "search_all") %>
+  <%= erb(File.read(Resque::JobHistoryServer.erb_path("_search_form.erb")),
+          locals: { job_search: job_search }) %>
+</div>
+<div class="job_history_reset" />
 
 <%= erb(File.read(Resque::JobHistoryServer.erb_path("_job_class_pagination.erb")),
         locals: { job_list: job_list, page_num: @page_num, page_size: @page_size }) %>
@@ -82,50 +90,8 @@
       </a></th>
     </tr>
 
-    <% job_list.job_summaries(@sort_by, @sort_order, @page_num, @page_size).each do |class_info| %>
-      <tr<%= class_info.last_run && !class_info.last_run.succeeded? ? " class=\"job_history_error\"" : "" %>>
-        <td>
-          <a href="<%= u("job history") %>/job_class_details?class_name=<%= class_info.class_name %>">
-            <%= class_info.class_name %>
-          </a>
-        </td>
-        <td>
-          <%= class_info.num_running_jobs.to_i %>
-        </td>
-        <td>
-          <%= class_info.total_run_jobs.to_i %>
-        </td>
-        <td>
-          <%= class_info.total_finished_jobs.to_i %>
-        </td>
-        <td>
-          <%= class_info.total_failed_jobs.to_i %>
-        </td>
-        <td>
-          <% if class_info.last_run && class_info.last_run.start_time %>
-            <%= time_ago_in_words(class_info.last_run.start_time) %> ago
-            (<%= class_info.last_run.start_time %>)
-          <% end %>
-        </td>
-        <td>
-          <% if class_info.last_run %>
-            <% if class_info.last_run.finished? %>
-              <%= distance_of_time_in_words(class_info.last_run.start_time, class_info.last_run.end_time) %>
-              (<%= class_info.last_run.end_time %>)
-            <% else %>
-              Still running...
-            <% end %>
-          <% end %>
-        </td>
-        <td>
-          <% if class_info.last_run && !class_info.last_run.succeeded? %>
-            No
-          <% else %>
-            Yes
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
+    <%= erb(File.read(Resque::JobHistoryServer.erb_path("_job_summary_rows.erb")),
+            locals: { summary_rows: job_list.job_summaries(@sort_by, @sort_order, @page_num, @page_size) }) %>
   </table>
 </div>
 
@@ -139,3 +105,4 @@
     <input type="submit" name="" value="Purge all histories"/>
   </form>
 </div>
+<div class="job_history_reset"/>

data/lib/resque/server/views/linear_history.erb

@@ -2,11 +2,19 @@
 
 <h1>Linear History</h1>
 
-<p>
-  <a href="<%= u("job history") %>">
-    Job History
-  </a>
-</p>
+<div>
+  <div class="job_history_linear_history_div">
+    <a href="<%= u("job history") %>">
+      Job History
+    </a>
+  </div>
+
+  <% job_search = Resque::Plugins::JobHistory::JobSearch.
+      new(search_type: "search_linear_history") %>
+  <%= erb(File.read(Resque::JobHistoryServer.erb_path("_search_form.erb")),
+          locals: { job_search: job_search }) %>
+</div>
+<div class="job_history_reset" />
 
 <% linear_history = Resque::Plugins::JobHistory::JobList.new.linear_jobs %>
 
@@ -17,47 +25,8 @@
                     page_num:       @page_num,
                     page_size:      @page_size }) %>
 
-  <div class="table_container">
-    <table>
-      <tr>
-        <th>Class</th>
-        <th>Started</th>
-        <th>Duration</th>
-        <th>Parameters</th>
-        <th>Error</th>
-      </tr>
-      <% jobs.each do |job_details| %>
-        <tr<%= job_details.succeeded? ? "" : " class=\"job_history_error\"" %>>
-          <td>
-            <a href="<%= u("job history/job_details") %>?<%=
-              { class_name: job_details.class_name, job_id: job_details.job_id }.to_param %>">
-              <%= job_details.class_name %>
-            </a>
-          </td>
-          <td>
-            <% if job_details.start_time %>
-              <%= time_ago_in_words(job_details.start_time) %> ago
-              (<%= job_details.start_time %>)
-            <% else %>
-              Error - missing start time
-            <% end %>
-          </td>
-          <td>
-            <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
-            <% if job_details.finished? %>
-              (<%= job_details.end_time %>)
-            <% end %>
-          </td>
-          <td>
-            <pre><code><%= "".html_safe + job_details.args.to_yaml %></code></pre>
-          </td>
-          <td>
-            <%= job_details.error %>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-  </div>
+  <%= erb(File.read(Resque::JobHistoryServer.erb_path("_job_list_table.erb")),
+          locals: { jobs: jobs, show_class: true }) %>
 
   <%= erb(File.read(Resque::JobHistoryServer.erb_path("_linear_pagination.erb")),
           locals: { linear_history: linear_history,
@@ -72,3 +41,4 @@
     <input type="submit" name="" value="Purge linear histories"/>
   </form>
 </div>
+<div class="job_history_reset"/>

data/lib/resque/server/views/search_results.erb

@@ -0,0 +1,68 @@
+<link href="<%= u("job_history/public/job_history.css") %>" media="screen" rel="stylesheet" type="text/css">
+
+<h1>Search Results</h1>
+
+<div>
+  <div class="job_history_linear_history_div">
+    <a href="<%= u("job history") %>">
+      Job History
+    </a>
+  </div>
+
+  <%= erb(File.read(Resque::JobHistoryServer.erb_path("_search_form.erb")),
+          locals: { job_search: @job_search }) %>
+</div>
+<div class="job_history_reset"/>
+
+<% if @job_search.more_records? %>
+  <div>
+    <p>
+      The search took too long and was stopped. You can continue the search from the point it was
+      stopped at <a href="#continue_search">below</a>.
+    </p>
+  </div>
+<% end %>
+
+<% if @job_search.class_results.blank? && @job_search.run_results.blank? %>
+  <div>
+    <p>
+      No results were found.
+    </p>
+  </div>
+<% end %>
+
+<% if @job_search.class_results.present? %>
+  <div class="table_container">
+    <table>
+      <tr>
+        <th>Class name</th>
+        <th>Running</th>
+        <th>Total Run</th>
+        <th>Finished</th>
+        <th>Failed</th>
+        <th>Last Run Start</th>
+        <th>Last Run Duration</th>
+        <th>Last Run successful</th>
+      </tr>
+
+      <%= erb(File.read(Resque::JobHistoryServer.erb_path("_job_summary_rows.erb")),
+              locals: { summary_rows: @job_search.class_results }) %>
+    </table>
+  </div>
+<% end %>
+
+<% if @job_search.run_results.present? %>
+  <%= erb(File.read(Resque::JobHistoryServer.erb_path("_job_list_table.erb")),
+          locals: { jobs: @job_search.run_results, show_class: true }) %>
+<% end %>
+
+<% if @job_search.more_records? %>
+  <form id="continue_search" method="POST" action="<%= u("job history/#{@job_search.search_type}") %>">
+    <% @job_search.search_settings(true).each do |setting_name, setting_value| %>
+      <input type="hidden" name="<%= setting_name %>" value="<%= setting_value %>"/>
+    <% end %>
+
+    <input type="submit" value="Continue Search"/>
+  </form>
+<% end %>
+<div class="job_history_reset"/>

data/lib/resque-job_history.rb

@@ -7,4 +7,5 @@ require File.expand_path(File.join("resque", "plugins", "job_history", "history_
 require File.expand_path(File.join("resque", "plugins", "job_history", "job_list"), File.dirname(__FILE__))
 require File.expand_path(File.join("resque", "plugins", "job_history", "job"), File.dirname(__FILE__))
 require File.expand_path(File.join("resque", "plugins", "job_history", "cleaner"), File.dirname(__FILE__))
+require File.expand_path(File.join("resque", "plugins", "job_history", "job_search"), File.dirname(__FILE__))
 require File.expand_path(File.join("resque", "plugins", "job_history"), File.dirname(__FILE__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -195,16 +195,21 @@ files:
 - lib/resque/plugins/job_history/history_list.rb
 - lib/resque/plugins/job_history/job.rb
 - lib/resque/plugins/job_history/job_list.rb
+- lib/resque/plugins/job_history/job_search.rb
 - lib/resque/plugins/version.rb
 - lib/resque/server/public/job_history.css
 - lib/resque/server/views/_job_class_pagination.erb
+- lib/resque/server/views/_job_list_table.erb
 - lib/resque/server/views/_job_pagination.erb
+- lib/resque/server/views/_job_summary_rows.erb
 - lib/resque/server/views/_jobs_list.erb
 - lib/resque/server/views/_linear_pagination.erb
+- lib/resque/server/views/_search_form.erb
 - lib/resque/server/views/job_class_details.erb
 - lib/resque/server/views/job_details.erb
 - lib/resque/server/views/job_history.erb
 - lib/resque/server/views/linear_history.erb
+- lib/resque/server/views/search_results.erb
 - lib/tasks/resque-job_history_tasks.rake
 homepage: https://github.com/RealNobody
 licenses: