resque-job_history 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 478ee17e82e8a2fcd742c17c56bda6b5586065d9
-  data.tar.gz: 259443101165e95cd9bf685159ae03ce8c266311
+  metadata.gz: 70bba4f7ca792423394d8f8a694329a721238bbe
+  data.tar.gz: 3c3532c52a3e99789ee259d057b42533185040c9
 SHA512:
-  metadata.gz: b546a34fa89692e2794f15d2801fa89faad6771a7015d4c778565b1c0241c52a2f5e928aee9a8fc2d6d856c07854d94a334b5355522efd27ec624841c9a932ab
-  data.tar.gz: 883a626bd6d5b813378164c4e8ab2ec397993218e07545cdd88245d5fc7e485af7e2e7696371eb18986cd16c14219a44497e2388c9146e336254fa4a758ed43f
+  metadata.gz: c86f488cc5e8485d45648b8f285fef4ed3ebee4b2e4846b9cb6920feab48fe2cb28f9def1a7f3e6154f51976d2089f2c9ad05c87a8f526eb1c545a5500761864
+  data.tar.gz: b52328b3f04d64f71101ed6903d0828dd470226512f15e6cb6ed50072b2a7fe62deff11b19d6bfba6a47e155965134b049a13a6aa91bea24c51737e5fb3a84ab

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require "bundler/setup"
 rescue LoadError

data/lib/resque/job_history_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "resque"
 require "resque/server"
 require "resque-job_history"
@@ -50,7 +52,7 @@ module Resque
             @sort_by    = params[:sort] || "class_name"
             @sort_order = params[:order] || "asc"
             @page_num   = (params[:page_num] || 1).to_i
-            @page_size  = (params[:page_size] || Resque::Plugins::JobHistory::HistoryBase::PAGE_SIZE).to_i
+            @page_size  = (params[:page_size] || Resque::Plugins::JobHistory::PAGE_SIZE).to_i
           end
         end
       end
@@ -83,8 +85,7 @@ module Resque
         base.class_eval do
           def set_running_page_params
             @running_page_num  = (params[:running_page_num] || 1).to_i
-            @running_page_size = (params[:running_page_size] ||
-                Resque::Plugins::JobHistory::HistoryBase::PAGE_SIZE).to_i
+            @running_page_size = params[:running_page_size]
           end
         end
       end
@@ -93,8 +94,7 @@ module Resque
         base.class_eval do
           def set_finished_page_params
             @finished_page_num  = (params[:finished_page_num] || 1).to_i
-            @finished_page_size = (params[:finished_page_size] ||
-                Resque::Plugins::JobHistory::HistoryBase::PAGE_SIZE).to_i
+            @finished_page_size = params[:finished_page_size]
           end
         end
       end
@@ -182,8 +182,6 @@ module Resque
   end
 end
 
-Resque.extend Resque::JobHistoryServer
-
 Resque::Server.class_eval do
   include Resque::JobHistoryServer
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Resque
   module Plugins
     module JobHistory
@@ -6,7 +8,7 @@ module Resque
         class << self
           def clean_all_old_running_jobs
             job_classes.each do |class_name|
-              Resque::Plugins::JobHistory::Job.new(class_name, "").clean_old_running_jobs
+              Resque::Plugins::JobHistory::HistoryDetails.new(class_name).clean_old_running_jobs
             end
           end
 
@@ -22,6 +24,7 @@ module Resque
             keys -= Resque::Plugins::JobHistory::HistoryList.new(class_name, "finished").job_ids
 
             keys.each do |stranded_key|
+              Resque::Plugins::JobHistory::Job.new(class_name, stranded_key).purge
               del_key(stranded_key, "Stranded job key deleted")
             end
           end
@@ -31,54 +34,64 @@ module Resque
               purge_class class_name
             end
 
-            del_key(Resque::Plugins::JobHistory::HistoryBase.new("").job_history_key,
-                    "Purging job_history_key")
+            del_key(Resque::Plugins::JobHistory::HistoryDetails.job_history_key, "Purging job_history_key")
+
+            redis.keys("*").each do |key|
+              del_key(key, "Purging unknown key")
+            end
           end
 
           def purge_invalid_jobs
-            viewer_klass.job_classes.each do |class_name|
-              next if Resque::Plugins::JobHistory::HistoryBase.new(class_name).class_name_valid?
+            job_classes.each do |class_name|
+              next if Resque::Plugins::JobHistory::HistoryDetails.new(class_name).class_name_valid?
 
               purge_class(class_name)
             end
           end
 
           def purge_class(class_name)
-            job_keys(class_name).each do |job_key|
+            return if similar_name?(class_name)
+
+            class_keys(class_name).each do |job_key|
               del_key(job_key, "Purging job key")
             end
+          end
 
-            job_support_keys(class_name).each do |support_key|
-              del_key(support_key, "Purging #{support_key}")
+          def similar_name?(class_name)
+            job_classes.any? do |job_name|
+              job_name != class_name && job_name[0..class_name.length - 1] == class_name
             end
           end
 
           private
 
           def job_classes
-            Resque::Plugins::JobHistory::JobList.new.job_classes
+            Resque::Plugins::JobHistory::JobList.new.job_classes.sort.reverse
+          end
+
+          def class_keys(class_name)
+            history_base = Resque::Plugins::JobHistory::HistoryDetails.new(class_name)
+
+            history_base.redis.keys("#{history_base.job_history_base_key}*")
           end
 
           def job_keys(class_name)
-            history_base = Resque::Plugins::JobHistory::HistoryBase.new(class_name)
+            history_base = Resque::Plugins::JobHistory::HistoryDetails.new(class_name)
 
             history_base.redis.keys("#{history_base.job_history_base_key}.*") - job_support_keys(history_base)
           end
 
           def job_support_keys(history_base)
-            if history_base.is_a?(String)
-              history_base = Resque::Plugins::JobHistory::HistoryBase.new(history_base)
-            end
-
             ["#{history_base.job_history_base_key}.running_jobs",
              "#{history_base.job_history_base_key}.total_running_jobs",
              "#{history_base.job_history_base_key}.finished_jobs",
              "#{history_base.job_history_base_key}.total_finished_jobs",
-             "#{history_base.job_history_base_key}.max_jobs"]
+             "#{history_base.job_history_base_key}.max_jobs",
+             "#{history_base.job_history_base_key}.total_failed"]
           end
 
           def redis
-            @redis ||= Resque::Plugins::JobHistory::HistoryBase.new("").redis
+            @redis ||= Resque::Plugins::JobHistory::HistoryDetails.new("").redis
           end
 
           def del_key(key, message)

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

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Resque
+  module Plugins
+    module JobHistory
+      # A base class for job history classes which provides a base key and a few common functions.
+      class HistoryDetails
+        attr_accessor :class_name
+
+        NAME_SPACE = "Resque::Plugins::ResqueJobHistory"
+
+        class << self
+          def job_history_key
+            "job_history"
+          end
+        end
+
+        def initialize(class_name)
+          @class_name = class_name
+        end
+
+        def redis
+          @redis ||= Redis::Namespace.new(NAME_SPACE, redis: Resque.redis)
+        end
+
+        def job_history_base_key
+          "#{Resque::Plugins::JobHistory::HistoryDetails.job_history_key}.#{class_name}"
+        end
+
+        def running_jobs
+          @running_list ||= HistoryList.new(class_name, "running")
+        end
+
+        def finished_jobs
+          @finished_list ||= HistoryList.new(class_name, "finished")
+        end
+
+        def max_concurrent_jobs
+          redis.get(max_running_key).to_i
+        end
+
+        def total_failed_jobs
+          redis.get(total_failed_key).to_i
+        end
+
+        def class_name_valid?
+          described_class.present?
+        end
+
+        def clean_old_running_jobs
+          too_old_time = class_purge_age.ago
+
+          running_jobs.jobs.each do |job|
+            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
+        end
+
+        private
+
+        def described_class
+          class_name.constantize
+        rescue StandardError
+          nil
+        end
+
+        def class_purge_age
+          described_class.try(:purge_age) || 24.hours
+        end
+
+        def class_history_len
+          described_class.try(:job_history_len) || MAX_JOB_HISTORY
+        end
+
+        def class_page_size
+          described_class.try(:page_size) || Resque::Plugins::JobHistory::PAGE_SIZE
+        end
+
+        def total_failed_key
+          "#{job_history_base_key}.total_failed"
+        end
+
+        def max_running_key
+          "#{job_history_base_key}.max_jobs"
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Resque
   module Plugins
     module JobHistory
       # JobHistory cleanup functions to allow the user to cleanup Redis for histories.
-      class HistoryList < HistoryBase
+      class HistoryList < HistoryDetails
         attr_accessor :list_name
 
         def initialize(class_name, list_name)
@@ -18,8 +20,6 @@ module Resque
           redis.incr(total_jobs_key)
 
           delete_old_jobs(job_count)
-
-          job_count
         end
 
         def remove_job(job_id)
@@ -28,9 +28,10 @@ module Resque
 
         def paged_jobs(page_num = 1, page_size = nil)
           page_size ||= class_page_size
-          page_size = Resque::Plugins::JobHistory::HistoryBase::PAGE_SIZE if page_size.to_i < 1
+          page_size = page_size.to_i
+          page_size = Resque::Plugins::JobHistory::PAGE_SIZE if page_size < 1
           start     = (page_num - 1) * page_size
-          start     = 0 if start >= num_jobs
+          start     = 0 if start >= num_jobs || start.negative?
 
           jobs(start, start + page_size - 1)
         end
@@ -62,7 +63,7 @@ module Resque
         private
 
         def add_to_history
-          redis.sadd(job_history_key, class_name)
+          redis.sadd(Resque::Plugins::JobHistory::HistoryDetails.job_history_key, class_name)
         end
 
         def delete_old_jobs(job_count)
@@ -73,6 +74,8 @@ module Resque
 
             job_count -= 1
           end
+
+          job_count
         end
 
         def total_jobs_key

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

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 module Resque
   module Plugins
     module JobHistory
       # a class encompassing a single job.
-      class Job < HistoryBase
+      class Job < HistoryDetails
         attr_accessor :job_id
 
         def initialize(class_name, job_id)
           super(class_name)
 
-          @job_id = job_id
+          @stored_values = nil
+          @job_id        = job_id
         end
 
         def job_key
@@ -24,7 +27,7 @@ module Resque
         end
 
         def succeeded?
-          error.blank?
+          finished? && error.blank?
         end
 
         def duration
@@ -44,21 +47,24 @@ module Resque
         end
 
         def start(*args)
-          num_jobs = running_list.add_job(job_id)
+          num_jobs = running_jobs.add_job(job_id)
 
-          record_num_jobs(num_jobs)
           record_job_start(*args)
+          record_num_jobs(num_jobs)
         end
 
         def finish
           redis.hset(job_key, "end_time", Time.now.utc.to_s)
 
-          finished_list.add_job(job_id)
-          running_list.remove_job(job_id)
+          finished_jobs.add_job(job_id)
+          running_jobs.remove_job(job_id)
+
+          reset
         end
 
         def failed(exception)
           redis.hset(job_key, "error", exception.message)
+          redis.incr(total_failed_key)
 
           finish
         end
@@ -68,6 +74,7 @@ module Resque
                      "error",
                      "Unknown - Job failed to signal ending after the configured purge time or "\
                        "was canceled manually.")
+          redis.incr(total_failed_key)
 
           finish
         end
@@ -79,14 +86,15 @@ module Resque
         end
 
         def purge
-          running_list.remove_job(job_id)
-          finished_list.remove_job(job_id)
+          # To keep the counts honest...
+          cancel unless finished?
+
+          running_jobs.remove_job(job_id)
+          finished_jobs.remove_job(job_id)
 
           redis.del(job_key)
-        end
 
-        def max_jobs
-          redis.get(max_running_key).to_i
+          reset
         end
 
         private
@@ -94,6 +102,8 @@ module Resque
         def record_job_start(*args)
           redis.hset(job_key, "start_time", Time.now.utc.to_s)
           redis.hset(job_key, "args", encode_args(*args))
+
+          reset
         end
 
         def stored_values
@@ -117,26 +127,13 @@ module Resque
             redis.set(max_running_key, num_jobs)
           end
 
-          return unless num_jobs > class_history_len
+          return unless num_jobs >= class_history_len
 
           clean_old_running_jobs
         end
 
-        def max_running_key
-          "#{job_history_base_key}.max_jobs"
-        end
-
-        def clean_old_running_jobs
-          too_old_time = class_purge_age.ago
-
-          running_list.jobs.each do |job|
-            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
+        def reset
+          @stored_values = nil
         end
       end
     end

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Resque
   module Plugins
     module JobHistory
       # A class encompassing tasks about the jobs as a whole.
       #
       # This class gets a list of the classes and can provide a summary for each.
-      class JobList < HistoryBase
+      class JobList < HistoryDetails
         def initialize
           super("")
         end
@@ -22,7 +24,7 @@ module Resque
         def job_summaries(sort_key = :class_name,
                           sort_order = "asc",
                           page_num = 1,
-                          page_size = Resque::Plugins::JobHistory::HistoryBase::PAGE_SIZE)
+                          page_size = Resque::Plugins::JobHistory::PAGE_SIZE)
           jobs = sorted_job_summaries(sort_key)
 
           page_start = (page_num - 1) * page_size
@@ -32,14 +34,14 @@ module Resque
         end
 
         def job_classes
-          redis.smembers(job_history_key)
+          redis.smembers(Resque::Plugins::JobHistory::HistoryDetails.job_history_key)
         end
 
         def job_class_summary(class_name)
-          history = Resque::Plugins::JobHistory::HistoryBase.new(class_name)
+          history = Resque::Plugins::JobHistory::HistoryDetails.new(class_name)
 
-          running_list  = history.running_list
-          finished_list = history.finished_list
+          running_list  = history.running_jobs
+          finished_list = history.finished_jobs
 
           class_summary_hash(class_name, finished_list, running_list)
         end
@@ -67,10 +69,10 @@ module Resque
               job_summary[sort_key.to_sym]
             when :start_time
               job_summary[:last_run].start_time
-            when :durration
+            when :duration
               job_summary[:last_run].duration
             when :success
-              job_summary[:last_run].succeeded?
+              job_summary[:last_run].succeeded? ? 1 : 0
           end
         end
 
@@ -81,7 +83,10 @@ module Resque
             finished_jobs:       finished_list.num_jobs,
             total_run_jobs:      running_list.total,
             total_finished_jobs: finished_list.total,
-            max_running_jobs:    Resque::Plugins::JobHistory::Job.new(class_name, "").max_jobs,
+            max_concurrent_jobs: Resque::Plugins::JobHistory::HistoryDetails.new(class_name).
+                max_concurrent_jobs,
+            total_failed_jobs:   Resque::Plugins::JobHistory::HistoryDetails.new(class_name).
+                total_failed_jobs,
             last_run:            latest_job(running_list, finished_list) }
         end
       end

data/lib/resque/plugins/job_history.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require "active_support/concern"
+require "active_support/core_ext/numeric/time"
 
 module Resque
   module Plugins
@@ -9,7 +12,9 @@ module Resque
 
       # Redis mapp:
       #   job_history - a set of all of the class names of all jobs
-      #   job_history.<class_name>.max_jobs - The maximum number of jobs that have run for this class.
+      #   job_history.<class_name>.max_jobs - The maximum number of jobs that have run concurrently
+      #                                       for this class.
+      #   job_history.<class_name>.total_failed_jobs - The total number of jobs that have failed
       #   job_history.<class_name>.total_finished_jobs - The maximum number of jobs that have run for
       #                                                  this class.
       #   job_history.<class_name>.running_jobs - a list of the IDs for all running jobs in the order
@@ -22,6 +27,8 @@ module Resque
       #     end_time
       #     error
       MAX_JOB_HISTORY = 200
+      PAGE_SIZE       = 25
+      PURGE_AGE       = 24.hours
 
       # The class methods added to the job class that is being enqueued and whose history is to be
       # recorded.
@@ -47,15 +54,19 @@ module Resque
         end
 
         def job_history_len
-          @job_history_len || MAX_JOB_HISTORY
+          @job_history_len ||= Resque::Plugins::JobHistory::MAX_JOB_HISTORY
         end
 
         def purge_age
-          @purge_jobs_after || 24.hours
+          @purge_jobs_after ||= Resque::Plugins::JobHistory::PURGE_AGE
         end
 
         def page_size
-          @page_size || Resque::Plugins::JobHistory::HistoryBase::PAGE_SIZE
+          @page_size ||= Resque::Plugins::JobHistory::PAGE_SIZE
+        end
+
+        def job_history
+          Resque::Plugins::JobHistory::HistoryDetails.new(name)
         end
       end
     end

data/lib/resque/plugins/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Resque
   module Plugins
     module JobHistory
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

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

@@ -1,7 +1,7 @@
 <div class="job_history_pagination_block">
   <% total_pages = job_list.job_classes.length / page_size %>
   <% total_pages += 1 if job_list.job_classes.length % page_size > 0 %>
-  <% page_num = 1 if page_num > total_pages %>
+  <% page_num = 1 if page_num > total_pages || page_num < 1 %>
   <% first_page = [1, page_num - 3].max %>
   <% last_page = [total_pages, page_num + 3].min %>
   <% last_page = page_num < 4 ? [total_pages, last_page + (4 - page_num)].min : last_page %>

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

@@ -1,6 +1,7 @@
 <div class="job_history_pagination_block">
   <% total_pages = history_list.num_jobs / page_size %>
   <% total_pages += 1 if history_list.num_jobs % page_size > 0 %>
+  <% page_num = 1 if page_num > total_pages || page_num < 1 %>
   <% first_page = [1, page_num - 3].max %>
   <% last_page = [total_pages, page_num + 3].min %>
   <% last_page = page_num < 4 ? [total_pages, last_page + (4 - page_num)].min : last_page %>

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

@@ -3,7 +3,7 @@
 <h1><%= @job_class_name %></h1>
 
 <% job_list = Resque::Plugins::JobHistory::JobList.new %>
-<% history = Resque::Plugins::JobHistory::HistoryBase.new(@job_class_name) %>
+<% history = Resque::Plugins::JobHistory::HistoryDetails.new(@job_class_name) %>
 <% class_info = job_list.job_class_summary(@job_class_name) %>
 
 <a href="<%= u("job history") %>">
@@ -64,7 +64,7 @@
 <%=
   erb(
       File.read(Resque::JobHistoryServer.erb_path("_jobs_list.erb")),
-      locals: { history_list:        history.running_list,
+      locals: { history_list:        history.running_jobs,
                 description:         "Running Jobs",
                 class_name:          @job_class_name,
                 page_num:            @running_page_num,
@@ -79,7 +79,7 @@
 <%=
   erb(
       File.read(Resque::JobHistoryServer.erb_path("_jobs_list.erb")),
-      locals: { history_list:        history.finished_list,
+      locals: { history_list:        history.finished_jobs,
                 description:         "Finished Jobs",
                 class_name:          @job_class_name,
                 page_num:            @finished_page_num,
@@ -93,6 +93,11 @@
 
 <br/>
 
-<form method="POST" action="purge_class?<%= { class_name: @job_class_name }.to_param %>">
-  <input type="submit" name="" value="Purge all histories for <%= @job_class_name %>"/>
-</form>
+<% 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.
+<% else %>
+  <form method="POST" action="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

@@ -67,7 +67,7 @@
   <input type="submit" name="" value="Delete this run"/>
 </form>
 
-<% if Resque::Plugins::JobHistory::HistoryBase.new(@job_class_name).class_name_valid?() %>
+<% if Resque::Plugins::JobHistory::HistoryDetails.new(@job_class_name).class_name_valid?() %>
   <form method="POST" action="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

@@ -43,11 +43,11 @@
                                          order_param("start_time", @sort_by, @sort_order) }.to_param %>">
       Last Run Start
     </a></th>
-    <th><a href="job%20history?<%= { sort:      "durration",
+    <th><a href="job%20history?<%= { sort:      "duration",
                                      page_size: @page_size,
                                      page_num:  @page_num,
                                      order:     job_list.
-                                         order_param("durration", @sort_by, @sort_order) }.to_param %>">
+                                         order_param("duration", @sort_by, @sort_order) }.to_param %>">
       Last Run Duration
     </a></th>
     <th><a href="job%20history?<%= { sort:      "success",

data/lib/resque-job_history.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require "resque"
-require File.expand_path(File.join("resque", "plugins", "job_history", "history_base"), File.dirname(__FILE__))
+require File.expand_path(File.join("resque", "plugins", "job_history", "history_details"),
+                         File.dirname(__FILE__))
 require File.expand_path(File.join("resque", "plugins", "job_history", "history_list"), File.dirname(__FILE__))
 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__))

data/lib/tasks/resque-job_history_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :resque do
 #   # Task goes here

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cornucopia
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,7 +177,7 @@ files:
 - lib/resque/job_history_server.rb
 - lib/resque/plugins/job_history.rb
 - lib/resque/plugins/job_history/cleaner.rb
-- lib/resque/plugins/job_history/history_base.rb
+- lib/resque/plugins/job_history/history_details.rb
 - lib/resque/plugins/job_history/history_list.rb
 - lib/resque/plugins/job_history/job.rb
 - lib/resque/plugins/job_history/job_list.rb

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

@@ -1,61 +0,0 @@
-module Resque
-  module Plugins
-    module JobHistory
-      # A base class for job history classes which provides a base key and a few common functions.
-      class HistoryBase
-        attr_accessor :class_name
-
-        NAME_SPACE = "Resque::Plugins::ResqueJobHistory".freeze
-        PAGE_SIZE  = 25
-
-        def initialize(class_name)
-          @class_name = class_name
-        end
-
-        def redis
-          @redis ||= Redis::Namespace.new(NAME_SPACE, redis: Resque.redis)
-        end
-
-        def job_history_key
-          "job_history"
-        end
-
-        def job_history_base_key
-          "#{job_history_key}.#{class_name}"
-        end
-
-        def running_list
-          @running_list = HistoryList.new(class_name, "running")
-        end
-
-        def finished_list
-          @finished_list = HistoryList.new(class_name, "finished")
-        end
-
-        def class_name_valid?
-          described_class.present?
-        end
-
-        private
-
-        def described_class
-          class_name.constantize
-        rescue StandardError
-          nil
-        end
-
-        def class_purge_age
-          described_class.try(:purge_age) || 24.hours
-        end
-
-        def class_history_len
-          described_class.try(:job_history_len) || MAX_JOB_HISTORY
-        end
-
-        def class_page_size
-          described_class.try(:page_size) || Resque::Plugins::JobHistory::HistoryBase::PAGE_SIZE
-        end
-      end
-    end
-  end
-end