resque-job_history 0.0.15 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 450d20fe90b22ac7771dae6ac8a400c173fe25ed308fd1333f2b4af4f1486e96
-  data.tar.gz: 24764a0569618115e274bf6c7e57ced5c2eafad2c572e9f55e36521ce5509a99
+  metadata.gz: 74efd65b38f6d08e25d24bce58b4fafa97e3136df8c0cef2b10177af4f85f17d
+  data.tar.gz: 96e82ad40c7bd5d0371e6dc975296235e04a2e71eec4cb0646bd1f876f7cc24d
 SHA512:
-  metadata.gz: c2793e58b7f27ab79717d5faf1eb198734c41881194430646997a8cdaaab2c66d3e7bfce2f41fd52515f4d8884515610ba12fa31d6c66791e6e9c5adf8b6be7b
-  data.tar.gz: 4aa8ce5bde5fa6aaf544a452bedae95b4a2d521bc4fdf253770b9cbcbb72d416023ae35ec02a631742e5d3a3b16f9ad602bc39cdb476ae982cf01d5d7442679e
+  metadata.gz: 82be65f4e0c8e1dbe91b237b135f1cd375c22240849cc16a549cde3481681106a126988af8c4674c6c834efa139ca48193ab0240603a1eb89a84f4d66965aaaa
+  data.tar.gz: 2de10d9d4f626e8d1ae32e1a3d4f589290badcf71979c846d353ab4b4eac7ecc183d8ebf0c97e750f85e15b95185c876f92738487aa22d3e46bd328435eedae4

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.
@@ -51,8 +51,7 @@ module Resque
         end
 
         def around_perform_job_history(*args)
-          running_job          = Resque::Plugins::JobHistory::Job.new(active_job_class_name(*args),
-                                                                      SecureRandom.uuid)
+          running_job          = Resque::Plugins::JobHistory::Job.new(active_job_class_name(*args), SecureRandom.uuid)
           self.most_recent_job = running_job
 
           begin

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_details.rb

@@ -68,8 +68,7 @@ module Resque
         end
 
         def linear_jobs
-          @linear_list ||= HistoryList.new("", "linear",
-                                           Resque::Plugins::JobHistory::HistoryDetails.max_linear_jobs)
+          @linear_list ||= HistoryList.new("", "linear", Resque::Plugins::JobHistory::HistoryDetails.max_linear_jobs)
         end
 
         def max_concurrent_jobs
@@ -111,7 +110,6 @@ module Resque
             job_start = job.start_time
 
             if job_start.blank? || job_start.to_time < too_old_time
-              job.start(*job.args) if job_start.blank?
               job.cancel
             end
           end

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,15 +44,24 @@ 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
 
         def start(*args)
+          record_job_start(*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
 
-          record_job_start(*args)
           record_num_jobs(num_jobs)
 
           self
@@ -135,11 +144,7 @@ module Resque
         end
 
         def stored_values
-          unless @stored_values
-            @stored_values = redis.hgetall(job_key).with_indifferent_access
-          end
-
-          @stored_values
+          @stored_values ||= redis.hgetall(job_key).with_indifferent_access
         end
 
         def encode_args(*args)

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.20
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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:
     - - ">="
@@ -266,7 +280,7 @@ files:
 - 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
+homepage: https://github.com/RealNobody/resque-job_history
 licenses:
 - MIT
 metadata: {}
@@ -285,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Keeps a history of run jobs by job.