resque-job_history 0.0.20 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74efd65b38f6d08e25d24bce58b4fafa97e3136df8c0cef2b10177af4f85f17d
-  data.tar.gz: 96e82ad40c7bd5d0371e6dc975296235e04a2e71eec4cb0646bd1f876f7cc24d
+  metadata.gz: 6a7d4b67d242c94799ded788270e28fcd0b0c8ec770e66bb14a2a4c334c57e8c
+  data.tar.gz: 8771dbe786146ddf9704214b36a2bbd47ce891aa5cd932c6501d815947536e80
 SHA512:
-  metadata.gz: 82be65f4e0c8e1dbe91b237b135f1cd375c22240849cc16a549cde3481681106a126988af8c4674c6c834efa139ca48193ab0240603a1eb89a84f4d66965aaaa
-  data.tar.gz: 2de10d9d4f626e8d1ae32e1a3d4f589290badcf71979c846d353ab4b4eac7ecc183d8ebf0c97e750f85e15b95185c876f92738487aa22d3e46bd328435eedae4
+  metadata.gz: 195e495dacd244026163b699afdcbf7830dee8904b0139b5f18db847fb4a8be65b4bdf84d56249b57102abcdcddf2ffe94d77486438404691641e596cf5ed0ab
+  data.tar.gz: 315d8eb3c4d34e4c18a88338173fc9034f11e02e026dc062a39758f535e917cdec926820a4c7ab00ec830cf475f21fce5fab55e2657faae374f166cf16a0e0fe

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_history" 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_history/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_history/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_history/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
@@ -150,10 +150,10 @@ module Resque
 
       def cancel_job(base)
         base.class_eval do
-          post "/job history/cancel_job" do
+          post "/job_history/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],
+            redirect u("job_history/job_details?#{{ class_name: params[:class_name],
                                                     job_id:     params[:job_id] }.to_param}")
           end
         end
@@ -161,57 +161,57 @@ module Resque
 
       def delete_job(base)
         base.class_eval do
-          post "/job history/delete_job" do
+          post "/job_history/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}")
+            redirect u("job_history/job_class_details?#{{ class_name: params[:class_name] }.to_param}")
           end
         end
       end
 
       def retry_job(base)
         base.class_eval do
-          post "/job history/retry_job" do
+          post "/job_history/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}")
+            redirect u("job_history/job_class_details?#{{ class_name: params[:class_name] }.to_param}")
           end
         end
       end
 
       def purge_class(base)
         base.class_eval do
-          post "/job history/purge_class" do
+          post "/job_history/purge_class" do
             Resque::Plugins::JobHistory::Cleaner.purge_class(params[:class_name])
 
-            redirect u("job history")
+            redirect u("job_history")
           end
         end
       end
 
       def purge_all(base)
         base.class_eval do
-          post "/job history/purge_all" do
+          post "/job_history/purge_all" do
             Resque::Plugins::JobHistory::Cleaner.purge_all_jobs
 
-            redirect u("job history")
+            redirect u("job_history")
           end
         end
       end
 
       def purge_linear_history(base)
         base.class_eval do
-          post "/job history/purge_linear_history" do
+          post "/job_history/purge_linear_history" do
             Resque::Plugins::JobHistory::Cleaner.purge_linear_history
 
-            redirect u("job history")
+            redirect u("job_history")
           end
         end
       end
 
       def search_all(base)
         base.class_eval do
-          post "/job history/search_all" do
+          post "/job_history/search_all" do
             @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
 
             @job_search.search
@@ -223,7 +223,7 @@ module Resque
 
       def search_job(base)
         base.class_eval do
-          post "/job history/search_job" do
+          post "/job_history/search_job" do
             @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
 
             @job_search.search
@@ -235,7 +235,7 @@ module Resque
 
       def search_linear_history(base)
         base.class_eval do
-          post "/job history/search_linear_history" do
+          post "/job_history/search_linear_history" do
             @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
 
             @job_search.search

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

@@ -109,8 +109,8 @@ module Resque
           running_jobs.jobs.each do |job|
             job_start = job.start_time
 
-            if job_start.blank? || job_start.to_time < too_old_time
-              job.cancel
+            if job_start.present? && job_start.to_time < too_old_time
+              job.cancel " Job timed out."
             end
           end
         end

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

@@ -28,12 +28,16 @@ module Resque
           stored_values[:end_time].present?
         end
 
+        def blank?
+          !redis.exists job_key
+        end
+
         def succeeded?
           error.blank?
         end
 
         def duration
-          (end_time || Time.now) - start_time
+          (end_time || Time.now) - (start_time || Time.now)
         end
 
         def end_time
@@ -45,7 +49,7 @@ module Resque
         end
 
         def uncompressed_args
-          return args if described_class.blank?
+          return args if described_class.blank? || args.blank?
           return args unless described_class.singleton_class.included_modules.map(&:name).include?("Resque::Plugins::Compressible")
           return args unless described_class.compressed?(args)
 
@@ -57,7 +61,7 @@ module Resque
         end
 
         def start(*args)
-          record_job_start(*args)
+          record_job_start(Time.now.utc.to_s, *args)
 
           num_jobs = running_jobs.add_job(job_id, class_name)
           linear_jobs.add_job(job_id, class_name) unless class_exclude_from_linear_history
@@ -67,10 +71,16 @@ module Resque
           self
         end
 
-        def finish
-          redis.hset(job_key, "end_time", Time.now.utc.to_s)
+        def finish(start_time = nil, *args)
+          if start_time.present?
+            record_job_start(start_time, *args)
+          end
+
+          if present?
+            redis.hset(job_key, "end_time", Time.now.utc.to_s)
+            finished_jobs.add_job(job_id, class_name)
+          end
 
-          finished_jobs.add_job(job_id, class_name)
           running_jobs.remove_job(job_id)
 
           reset
@@ -78,18 +88,34 @@ module Resque
           self
         end
 
-        def failed(exception)
-          redis.hset(job_key, "error", exception_message(exception))
+        def failed(exception, start_time = nil, *args)
+          if start_time.present?
+            record_job_start(start_time, *args)
+          end
+
+          redis.hset(job_key, "error", exception_message(exception)) if present?
           redis.incr(total_failed_key)
 
           finish
         end
 
-        def cancel
-          redis.hset(job_key,
-                     "error",
-                     "Unknown - Job failed to signal ending after the configured purge time or "\
-                       "was canceled manually.")
+        def abort
+          running_jobs.remove_job(job_id)
+
+          reset
+        end
+
+        def cancel(caller_message = nil, start_time = nil, *args)
+          if start_time.present?
+            record_job_start(start_time, *args)
+          end
+
+          if present?
+            redis.hset(job_key,
+                       "error",
+                       "Unknown - Job failed to signal ending after the configured purge time or was canceled manually.#{caller_message}")
+          end
+
           redis.incr(total_failed_key)
 
           finish
@@ -111,7 +137,7 @@ module Resque
 
         def purge
           # To keep the counts honest...
-          cancel unless finished?
+          abort unless finished?
 
           remove_from_job_lists
 
@@ -136,8 +162,8 @@ module Resque
           linear_jobs.remove_job(job_id)
         end
 
-        def record_job_start(*args)
-          redis.hset(job_key, "start_time", Time.now.utc.to_s)
+        def record_job_start(start_time, *args)
+          redis.hset(job_key, "start_time", start_time)
           redis.hset(job_key, "args", encode_args(*args))
 
           reset

data/lib/resque/plugins/job_history.rb

@@ -51,6 +51,7 @@ module Resque
         end
 
         def around_perform_job_history(*args)
+          start_time           = Time.now
           running_job          = Resque::Plugins::JobHistory::Job.new(active_job_class_name(*args), SecureRandom.uuid)
           self.most_recent_job = running_job
 
@@ -59,12 +60,15 @@ module Resque
 
             yield if block_given?
 
-            running_job.finish
+            running_job.finish(start_time, *args)
           rescue StandardError => exception
-            running_job.failed exception
+            running_job.failed exception, start_time, *args
             raise
           ensure
-            running_job.cancel unless running_job.finished? || running_job.error
+            if running_job.present? && !running_job.finished? && !running_job.error
+              running_job.cancel(" Job did not signal completion on finish.", start_time, *args)
+            end
+
             self.most_recent_job = nil
           end
         end
@@ -99,18 +103,9 @@ module Resque
 
         private
 
-        def job_class_has_history?(*args)
-          if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper") &&
-              self >= ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper
-            args[-1]["job_class"].constantize.included_modules.include? Resque::Plugins::JobHistory
-          else
-            true
-          end
-        end
-
         def active_job_class_name(*args)
           if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper") &&
-              self >= ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper
+              self >= "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize
             args[-1]["job_class"]
           else
             name
@@ -119,7 +114,7 @@ module Resque
 
         def active_job_args(*args)
           if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper") &&
-              self >= ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper
+              self >= "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize
             args[-1]["arguments"]
           else
             args
@@ -144,8 +139,7 @@ module Resque
 end
 
 if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper")
-  unless ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper.included_modules.
-      include? Resque::Plugins::JobHistory
-    ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper.include Resque::Plugins::JobHistory
+  unless "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize.included_modules.include? Resque::Plugins::JobHistory
+    "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize.include Resque::Plugins::JobHistory
   end
 end

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

@@ -9,7 +9,7 @@
 
   <% if total_pages > 1 %>
     <div class="job_history_prev_links">
-      <a href="<%= u("job history") %>?<%= { sort:      @sort_by,
+      <a href="<%= u("job_history") %>?<%= { sort:      @sort_by,
                                              page_size: page_size,
                                              page_num:  1,
                                              order:     @sort_order }.to_param %>"
@@ -18,7 +18,7 @@
         &lt;&lt; First
       </a>
 
-      <a href="<%= u("job history") %>?<%= { sort:      @sort_by,
+      <a href="<%= u("job_history") %>?<%= { sort:      @sort_by,
                                              page_size: page_size,
                                              page_num:  [1, page_num - 1].max,
                                              order:     @sort_order }.to_param %>"
@@ -31,7 +31,7 @@
     <div class="job_history_pages">
       <% (first_page..last_page).each do |page_number| %>
         <% if page_number != page_num %>
-          <a href="<%= u("job history") %>?<%= { sort:      @sort_by,
+          <a href="<%= u("job_history") %>?<%= { sort:      @sort_by,
                                                  page_size: page_size,
                                                  page_num:  page_number,
                                                  order:     @sort_order }.to_param %>"
@@ -45,7 +45,7 @@
     </div>
 
     <div class="job_history_next_links">
-      <a href="<%= u("job history") %>?<%= { sort:      @sort_by,
+      <a href="<%= u("job_history") %>?<%= { sort:      @sort_by,
                                              page_size: page_size,
                                              page_num:  [total_pages, page_num + 1].min,
                                              order:     @sort_order }.to_param %>"
@@ -54,7 +54,7 @@
         Next &gt;
       </a>
 
-      <a href="<%= u("job history") %>?<%= { sort:      @sort_by,
+      <a href="<%= u("job_history") %>?<%= { sort:      @sort_by,
                                              page_size: page_size,
                                              page_num:  total_pages,
                                              order:     @sort_order }.to_param %>"

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

@@ -13,14 +13,14 @@
       <tr<%= job_details.succeeded? ? "" : " class=\"job_history_error\"" %>>
         <% if show_class %>
           <td>
-            <a href="<%= u("job history/job_class_details") %>?<%=
+            <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=<%=
+          <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

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

@@ -9,7 +9,7 @@
 
   <% if total_pages > 1 %>
     <div class="job_history_prev_links">
-      <a href="<%= u("job history/job_class_details") %>?<%=
+      <a href="<%= u("job_history/job_class_details") %>?<%=
         { class_name:                   class_name,
           "#{primary_type}_page_size"   => page_size,
           "#{primary_type}_page_num"    => 1,
@@ -20,7 +20,7 @@
         &lt;&lt; First
       </a>
 
-      <a href="<%= u("job history/job_class_details") %>?<%=
+      <a href="<%= u("job_history/job_class_details") %>?<%=
         { class_name:                   class_name,
           "#{primary_type}_page_size"   => page_size,
           "#{primary_type}_page_num"    => [1, page_num - 1].max,
@@ -35,7 +35,7 @@
     <div class="job_history_pages">
       <% (first_page..last_page).each do |page_number| %>
         <% if page_number != page_num %>
-          <a href="<%= u("job history/job_class_details") %>?<%=
+          <a href="<%= u("job_history/job_class_details") %>?<%=
             { class_name:                   class_name,
               "#{primary_type}_page_size"   => page_size,
               "#{primary_type}_page_num"    => page_number,
@@ -51,7 +51,7 @@
     </div>
 
     <div class="job_history_next_links">
-      <a href="<%= u("job history/job_class_details") %>?<%=
+      <a href="<%= u("job_history/job_class_details") %>?<%=
         { class_name:                   class_name,
           "#{primary_type}_page_size"   => page_size,
           "#{primary_type}_page_num"    => [total_pages, page_num + 1].min,
@@ -62,7 +62,7 @@
         Next &gt;
       </a>
 
-      <a href="<%= u("job history/job_class_details") %>?<%=
+      <a href="<%= u("job_history/job_class_details") %>?<%=
         { class_name:                   class_name,
           "#{primary_type}_page_size"   => page_size,
           "#{primary_type}_page_num"    => total_pages,

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

@@ -1,7 +1,7 @@
 <% 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 %>">
+      <a href="<%= u("job_history") %>/job_class_details?class_name=<%= class_info.class_name %>">
         <%= class_info.class_name %>
       </a>
     </td>

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

@@ -9,7 +9,7 @@
 
   <% if total_pages > 1 %>
     <div class="job_history_prev_links">
-      <a href="<%= u("job history/linear_history") %>?<%=
+      <a href="<%= u("job_history/linear_history") %>?<%=
         { "page_size" => page_size,
           "page_num"  => 1 }.to_param %>"
          class="job_history_first_page"
@@ -17,7 +17,7 @@
         &lt;&lt; First
       </a>
 
-      <a href="<%= u("job history/linear_history") %>?<%=
+      <a href="<%= u("job_history/linear_history") %>?<%=
         { "page_size" => page_size,
           "page_num"  => [1, page_num - 1].max }.to_param %>"
          class="job_history_prev_page"
@@ -29,7 +29,7 @@
     <div class="job_history_pages">
       <% (first_page..last_page).each do |page_number| %>
         <% if page_number != page_num %>
-          <a href="<%= u("job history/linear_history") %>?<%=
+          <a href="<%= u("job_history/linear_history") %>?<%=
             { "page_size" => page_size,
               "page_num"  => page_number }.to_param %>"
              class="job_history_page">
@@ -42,7 +42,7 @@
     </div>
 
     <div class="job_history_next_links">
-      <a href="<%= u("job history/linear_history") %>?<%=
+      <a href="<%= u("job_history/linear_history") %>?<%=
         { "page_size" => page_size,
           "page_num"  => [total_pages, page_num + 1].min }.to_param %>"
          class="job_history_next_page"
@@ -50,7 +50,7 @@
         Next &gt;
       </a>
 
-      <a href="<%= u("job history/linear_history") %>?<%=
+      <a href="<%= u("job_history/linear_history") %>?<%=
         { "page_size" => page_size,
           "page_num"  => total_pages }.to_param %>"
          class="job_history_last_page"

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

@@ -1,5 +1,5 @@
 <div id="job_history_search_div">
-  <form method="POST" action="<%= u("job history/#{job_search.search_type}") %>">
+  <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 %>

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

@@ -8,7 +8,7 @@
 
 <div>
   <div class="job_history_linear_history_div">
-    <a href="<%= u("job history") %>">
+    <a href="<%= u("job_history") %>">
       Job History
     </a>
   </div>
@@ -121,7 +121,7 @@
     </p>
   </div>
 <% else %>
-  <form method="POST" action="<%= u("job history/purge_class") %>?<%= { class_name: @job_class_name }.to_param %>">
+  <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 %>

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

@@ -7,11 +7,11 @@
 <% job_details = Resque::Plugins::JobHistory::Job.new(@job_class_name, @job_id) %>
 
 <p>
-  <a href="<%= u("job history") %>">
+  <a href="<%= u("job_history") %>">
     Job History
   </a>
   |
-  <a href="<%= u("job history/job_class_details") %>?<%= { class_name: @job_class_name }.to_param %>">
+  <a href="<%= u("job_history/job_class_details") %>?<%= { class_name: @job_class_name }.to_param %>">
     <%= @job_class_name %>
   </a>
 </p>
@@ -68,19 +68,19 @@
 <br/>
 
 <% unless job_details.finished? %>
-  <form method="POST" action="<%= u("job history/cancel_job") %>?<%=
+  <form method="POST" action="<%= u("job_history/cancel_job") %>?<%=
     { class_name: @job_class_name, job_id: @job_id }.to_param %>">
     <input type="submit" name="" value="Job is not running - Cancel job"/>
   </form>
 <% end %>
 
-<form method="POST" action="<%= u("job history/delete_job") %>?<%=
+<form method="POST" action="<%= u("job_history/delete_job") %>?<%=
   { class_name: @job_class_name, job_id: @job_id }.to_param %>">
   <input type="submit" name="" value="Delete this run"/>
 </form>
 
 <% if Resque::Plugins::JobHistory::HistoryDetails.new(@job_class_name).class_name_valid?() %>
-  <form method="POST" action="<%= u("job history/retry_job") %>?<%=
+  <form method="POST" action="<%= u("job_history/retry_job") %>?<%=
     { class_name: @job_class_name, job_id: @job_id }.to_param %>">
     <input type="submit" name="" value="Retry this run"/>
   </form>

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

@@ -6,7 +6,7 @@
 
 <div>
   <div class="job_history_linear_history_div">
-    <a href="<%= u("job history/linear_history") %>">
+    <a href="<%= u("job_history/linear_history") %>">
       Linear History
     </a>
   </div>
@@ -24,7 +24,7 @@
 <div class="table_container">
   <table>
     <tr>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "class_name",
           page_size: @page_size,
           page_num:  @page_num,
@@ -32,7 +32,7 @@
               order_param("class_name", @sort_by, @sort_order) }.to_param %>">
         Class name
       </a></th>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "num_running_jobs",
           page_size: @page_size,
           page_num:  @page_num,
@@ -40,7 +40,7 @@
               order_param("num_running_jobs", @sort_by, @sort_order) }.to_param %>">
         Running
       </a></th>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "total_run_jobs",
           page_size: @page_size,
           page_num:  @page_num,
@@ -48,7 +48,7 @@
               order_param("total_run_jobs", @sort_by, @sort_order) }.to_param %>">
         Total Run
       </a></th>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "total_finished_jobs",
           page_size: @page_size,
           page_num:  @page_num,
@@ -56,7 +56,7 @@
               order_param("total_finished_jobs", @sort_by, @sort_order) }.to_param %>">
         Finished
       </a></th>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "total_failed_jobs",
           page_size: @page_size,
           page_num:  @page_num,
@@ -64,7 +64,7 @@
               order_param("total_failed_jobs", @sort_by, @sort_order) }.to_param %>">
         Failed
       </a></th>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "start_time",
           page_size: @page_size,
           page_num:  @page_num,
@@ -72,7 +72,7 @@
               order_param("start_time", @sort_by, @sort_order) }.to_param %>">
         Last Run Start
       </a></th>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "duration",
           page_size: @page_size,
           page_num:  @page_num,
@@ -80,7 +80,7 @@
               order_param("duration", @sort_by, @sort_order) }.to_param %>">
         Last Run Duration
       </a></th>
-      <th><a href="<%= u("job history") %>?<%=
+      <th><a href="<%= u("job_history") %>?<%=
         { sort:      "success",
           page_size: @page_size,
           page_num:  @page_num,
@@ -101,7 +101,7 @@
 <br/>
 
 <div>
-  <form method="POST" action="<%= u("job history/purge_all") %>">
+  <form method="POST" action="<%= u("job_history/purge_all") %>">
     <input type="submit" name="" value="Purge all histories"/>
   </form>
 </div>

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

@@ -4,7 +4,7 @@
 
 <div>
   <div class="job_history_linear_history_div">
-    <a href="<%= u("job history") %>">
+    <a href="<%= u("job_history") %>">
       Job History
     </a>
   </div>
@@ -37,7 +37,7 @@
 <br/>
 
 <div>
-  <form method="POST" action="<%= u("job history/purge_linear_history") %>">
+  <form method="POST" action="<%= u("job_history/purge_linear_history") %>">
     <input type="submit" name="" value="Purge linear histories"/>
   </form>
 </div>

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

@@ -4,7 +4,7 @@
 
 <div>
   <div class="job_history_linear_history_div">
-    <a href="<%= u("job history") %>">
+    <a href="<%= u("job_history") %>">
       Job History
     </a>
   </div>
@@ -57,7 +57,7 @@
 <% end %>
 
 <% if @job_search.more_records? %>
-  <form id="continue_search" method="POST" action="<%= u("job history/#{@job_search.search_type}") %>">
+  <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 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.23
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Keeps a history of run jobs by job.