resque-job_history 0.0.14 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 729469347ae2a953d724c75fabe4288d6f1f1f4f
-  data.tar.gz: cd6e4be39a92dcfe67ec27781bd61eb7f42dd35f
+SHA256:
+  metadata.gz: 80f12f012c42ce5ef6d0752d9577bab10c136e23092b993fa8ed7956a6fe14f9
+  data.tar.gz: 6402151b24dd3ed4977c5dc84b6961183b0325565c6311160d47d614d6ac77bf
 SHA512:
-  metadata.gz: 94add7258c11e34d7b325db8101112a88ffd14cf089d37cd6f61d2b9431e850c7be5df62745cf6c62337736a251da041f659fd0f83fdeba5a30f60c0fef46143
-  data.tar.gz: a7b407d5dd8929ddf275d0cd5287f7a4f38b1c3e84bd5de0987fdb6bdb8364b1ce5ed3eb809086f1efe26c10a0e4eb16714bfe68c53300e25582e1fcb1f1ae29
+  metadata.gz: 8a8a66dd34b106ff998329a8d9d97c49049e9bae75b0fe3f7e378d6758d9f62645e0b0613933868fc97f591dfbdd607c7865f9ab94cc013d7f76f9a64de07f0e
+  data.tar.gz: b8c3c45e954382aa89d9e8533da10647df5d5e47e9d09cf50cc9bc42b2390d30feb72a8dd385a454e4a319906bed65f6353ce8316f97a5a80bb02d0f4fc59d87

data/lib/resque/job_history_server.rb

@@ -41,7 +41,7 @@ module Resque
         job_history_params(base)
 
         base.class_eval do
-          get "/job%20history" 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%20history/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%20history/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%20history/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
@@ -130,7 +130,7 @@ module Resque
 
       def add_static_files(base)
         base.class_eval do
-          get %r{job_history/public/([a-z_]+\.[a-z]+)} do
+          get %r{/job_history/public/([a-z_]+\.[a-z]+)} do
             send_file Resque::JobHistoryServer.public_path(params[:captures].first)
           end
         end
@@ -150,7 +150,7 @@ module Resque
 
       def cancel_job(base)
         base.class_eval do
-          post "/job%20history/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],
@@ -161,7 +161,7 @@ module Resque
 
       def delete_job(base)
         base.class_eval do
-          post "/job%20history/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}")
@@ -171,7 +171,7 @@ module Resque
 
       def retry_job(base)
         base.class_eval do
-          post "/job%20history/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}")
@@ -181,7 +181,7 @@ module Resque
 
       def purge_class(base)
         base.class_eval do
-          post "/job%20history/purge_class" do
+          post "/job history/purge_class" do
             Resque::Plugins::JobHistory::Cleaner.purge_class(params[:class_name])
 
             redirect u("job history")
@@ -191,7 +191,7 @@ module Resque
 
       def purge_all(base)
         base.class_eval do
-          post "/job%20history/purge_all" do
+          post "/job history/purge_all" do
             Resque::Plugins::JobHistory::Cleaner.purge_all_jobs
 
             redirect u("job history")
@@ -201,7 +201,7 @@ module Resque
 
       def purge_linear_history(base)
         base.class_eval do
-          post "/job%20history/purge_linear_history" do
+          post "/job history/purge_linear_history" do
             Resque::Plugins::JobHistory::Cleaner.purge_linear_history
 
             redirect u("job history")
@@ -211,7 +211,7 @@ module Resque
 
       def search_all(base)
         base.class_eval do
-          post "/job%20history/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%20history/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%20history/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.rb

@@ -10,7 +10,7 @@ module Resque
     module JobHistory
       extend ActiveSupport::Concern
 
-      # Redis mapp:
+      # Redis map:
       #   job_history - a set of all of the class names of all jobs
       #   job_history..linear_jobs - a list of the IDs for all jobs that have run in the order
       #                                          they were started.

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

@@ -48,6 +48,8 @@ module Resque
               purge_class class_name
             end
 
+            purge_linear_history
+
             del_key(Resque::Plugins::JobHistory::HistoryDetails.job_history_key, "Purging job_history_key")
 
             redis.keys("*").each do |key|

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

@@ -86,11 +86,13 @@ module Resque
         end
 
         def delete_old_jobs(job_count)
-          while job_count > max_jobs
-            job_id = redis.rpop(job_list_key)
+          while num_jobs > max_jobs
+            job_id         = redis.rpop(job_list_key)
+            job_class_name = job_class(job_id)
+
             remove_job_data(job_id)
 
-            Resque::Plugins::JobHistory::Job.new(job_class(job_id), job_id).safe_purge
+            Resque::Plugins::JobHistory::Job.new(job_class_name, job_id).safe_purge
 
             job_count -= 1
           end

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

@@ -44,6 +44,14 @@ module Resque
           decode_args(stored_values[:args])
         end
 
+        def uncompressed_args
+          return args if described_class.blank?
+          return args unless described_class.singleton_class.included_modules.map(&:name).include?("Resque::Plugins::Compressible")
+          return args unless described_class.compressed?(args)
+
+          described_class.uncompressed_args(args.first[:payload] || args.first["payload"])
+        end
+
         def error
           stored_values[:error]
         end

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

@@ -39,7 +39,7 @@
           <% end %>
         </td>
         <td>
-          <pre><code><%= "".html_safe + job_details.args.to_yaml %></code></pre>
+          <pre><code><%= "".html_safe + job_details.uncompressed_args.to_yaml %></code></pre>
         </td>
         <td>
           <%= job_details.error %>

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

@@ -26,7 +26,7 @@
     <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) %>
+          <%= distance_of_time_in_words((class_info.last_run.start_time || Time.now), (class_info.last_run.end_time || Time.now)) %>
           (<%= class_info.last_run.end_time %>)
         <% else %>
           Still running...

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

@@ -49,7 +49,7 @@
         Params
       </td>
       <td>
-        <pre><code><%= "".html_safe + job_details.args.to_yaml %></code></pre>
+        <pre><code><%= "".html_safe + job_details.uncompressed_args.to_yaml %></code></pre>
       </td>
     </tr>
     <% unless job_details.succeeded? %>

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.19
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -95,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: cornucopia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: haml-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cornucopia
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: resque-compressible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,21 +193,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-lint
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -252,7 +266,6 @@ files:
 - 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
@@ -286,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Keeps a history of run jobs by job.

data/lib/resque/plugins/version.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Resque
-  module Plugins
-    module JobHistory
-      VERSION = "0.0.14"
-    end
-  end
-end