resque-job-stats 0.2.2 → 0.3.0

data/Gemfile

@@ -1,11 +1,12 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gem 'resque', '~> 1.17'
 
 group :development do
-  gem "minitest", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem 'minitest', '>= 0'
+  gem 'bundler', '~> 1.1.0'
+  gem 'jeweler', '~> 1.8.3'
   gem 'mynyml-redgreen', '~> 0.7.1'
+  gem 'timecop'
+  gem 'rack-test'
 end

data/README.rdoc

@@ -9,10 +9,13 @@ Stats are tracked per Job type (class/module) in addition to the worker based st
 Stats tracked are:
 
 * Jobs performed
+* Jobs enqueued
 * Jobs failed
 * Duration of last x jobs completed
 * Average job duration over last 100 jobs completed
 * Longest job duration over last 100 jobs completed
+* Jobs enqueued as timeseries data (minute, hourly)
+* Jobs performed as timeseries data (minute, hourly)
 
 This information can be used to help track performance and diagnose specific bottlenecks.
 
@@ -34,7 +37,7 @@ Simply extend your class
     extend Resque::Plugins::JobStats
 
     @queue = :my_job
-    def self.perform(*payload)
+    def self.perform(*args)
       # ..
     end
   end
@@ -45,11 +48,14 @@ Alternatively you can include just the metric you wish to record.
 
   class MyVerboseJob
     extend Resque::Plugins::JobStats::Performed
+    extend Resque::Plugins::JobStats::Enqueued
     extend Resque::Plugins::JobStats::Failed
     extend Resque::Plugins::JobStats::Duration
+    extend Resque::Plugins::JobStats::Timeseries::Enqueued
+    extend Resque::Plugins::JobStats::Timeseries::Performed
 
     @queue = :my_job
-    def self.perform(*payload)
+    def self.perform(*args)
       # ...
     end
   end
@@ -76,9 +82,33 @@ You may set the number of jobs to include by setting the @durations_recorded var
     end
   end
 
+=== Timeseries module
+
+The timeseries module provides timeseries counts of jobs performed. The metrics are rolling and kept for a period of time before being expired.
+The timestamp used for the timeseries data is UTC.
+
+== Resque Web Tab
+
+The Resque web page for showing the statistics will only display jobs that extend Resque::Plugins::JobStats (in other words, just
+the jobs that include all of the metrics):
+
+  class MyJob
+    extend Resque::Plugins::JobStats
+    ...
+  end
+
+The interface can be included in your app like this:
+
+  require 'resque-job-status/server'
+
+If you wish to display only certain metrics, you can filter the metrics accordingly.  The default metrics can be found in Resque::Plugins::JobStats::Statistic.
+
+  Resque::Server.job_stats_to_display = [:jobs_enqueued, :job_rolling_avg]
+
 == TODO
 
-* Add ui for stats in resque-web
+* Find clean way to add queue wait time stats.
+* Screen shot of interface with lots of stats
 
 == Contributing to resque-job-stats
 
@@ -90,7 +120,12 @@ You may set the number of jobs to include by setting the @durations_recorded var
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+== Contributers
+
+* {damonmorgan}[https://github.com/damonmorgan]
+* {unclebilly}[https://github.com/unclebilly]
+
 == Copyright
 
-Copyright (c) 2011 Alan Peabody. See LICENSE.txt for further details.
+Copyright (c) 2011-2012 Alan Peabody. See LICENSE.txt for further details.
 

data/Rakefile

@@ -32,17 +32,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/resque-job-stats/server.rb

@@ -0,0 +1,68 @@
+require 'resque/server'
+
+module Resque
+  module Plugins
+    module JobStats
+      module Server
+        VIEW_PATH = File.join(File.dirname(__FILE__), 'server', 'views')
+
+        def job_stats_to_display
+          @job_stats_to_display ||= Resque::Plugins::JobStats::Statistic::DEFAULT_STATS
+        end
+
+        # Set this to an array of the public accessor names in Resque::Plugins::JobStats::Statistic
+        # that you wish to display.  The default is [:jobs_enqueued, :jobs_performed, :jobs_failed, :job_rolling_avg, :longest_job]
+        # Examples:
+        #   Resque::Server.job_stats_to_display = [:jobs_performed, :job_rolling_avg]
+        def job_stats_to_display=(stats)
+          @job_stats_to_display = stats
+        end
+
+        module Helpers
+          def display_stat?(stat_name)
+            self.class.job_stats_to_display == :all ||
+              [self.class.job_stats_to_display].flatten.map(&:to_sym).include?(stat_name.to_sym)
+          end
+
+          def time_display(float)
+            float.zero? ? "" : ("%.2f" % float.to_s) + "s"
+          end
+
+          def number_display(num)
+            num.zero? ? "" : num
+          end
+
+          def stat_header(stat_name)
+            if(display_stat?(stat_name))
+              "<th>" + stat_name.to_s.gsub(/_/,' ').capitalize + "</th>"
+            end
+          end
+
+          def display_stat(stat, stat_name, format)
+            if(display_stat?(stat_name))
+              formatted_stat = self.send(format, stat.send(stat_name))
+              "<td>#{formatted_stat}</td>"
+            end
+          end
+        end
+
+        class << self
+          def registered(app)
+            app.get '/job_stats' do
+              @jobs = Resque::Plugins::JobStats::Statistic.find_all(self.class.job_stats_to_display).sort
+              erb(File.read(File.join(VIEW_PATH, 'job_stats.erb')))
+            end
+            # We have little choice in using this funky name - Resque
+            # already has a "Stats" tab, and it doesn't like
+            # tab names with spaces in it (it translates the url as job%20stats)
+            app.tabs << "Job_Stats"
+
+            app.helpers(Helpers)
+          end
+        end
+      end
+    end
+  end
+end
+
+Resque::Server.register Resque::Plugins::JobStats::Server

data/lib/resque-job-stats/server/views/job_stats.erb

@@ -0,0 +1,26 @@
+<h1>Resque Job Stats</h1>
+
+<p class="intro">
+  This page displays statistics about jobs that have been executed.
+</p>
+
+<table>
+  <tr>
+    <th>Name</th>
+    <%= stat_header(:jobs_enqueued) %>
+    <%= stat_header(:jobs_performed) %>
+    <%= stat_header(:jobs_failed) %>
+    <%= stat_header(:job_rolling_avg) %>
+    <%= stat_header(:longest_job) %>
+  </tr>
+  <% @jobs.each do |job| %>
+    <tr>
+      <td><%= job.name %></td>      
+      <%= display_stat(job, :jobs_enqueued,   :number_display) %>
+      <%= display_stat(job, :jobs_performed,  :number_display) %>
+      <%= display_stat(job, :jobs_failed,     :number_display) %>
+      <%= display_stat(job, :job_rolling_avg, :time_display) %>
+      <%= display_stat(job, :longest_job,     :time_display) %>
+    </tr>
+  <% end %>
+</table>

data/lib/resque/plugins/job_stats.rb

@@ -1,14 +1,28 @@
 require 'resque'
 require 'resque/plugins/job_stats/performed'
+require 'resque/plugins/job_stats/enqueued'
 require 'resque/plugins/job_stats/failed'
 require 'resque/plugins/job_stats/duration'
+require 'resque/plugins/job_stats/timeseries'
+require 'resque/plugins/job_stats/statistic'
 
 module Resque
   module Plugins
     module JobStats
       include Resque::Plugins::JobStats::Performed
+      include Resque::Plugins::JobStats::Enqueued
       include Resque::Plugins::JobStats::Failed
       include Resque::Plugins::JobStats::Duration
+      include Resque::Plugins::JobStats::Timeseries::Enqueued
+      include Resque::Plugins::JobStats::Timeseries::Performed
+
+      def self.extended(base)
+        self.measured_jobs << base
+      end
+
+      def self.measured_jobs
+        @measured_jobs ||= []
+      end
     end
   end
 end

data/lib/resque/plugins/job_stats/duration.rb

@@ -19,7 +19,7 @@ module Resque
         end
 
         # Increments the failed count when job is complete
-        def around_perform_job_stats_duration(*payload)
+        def around_perform_job_stats_duration(*args)
           start = Time.now
           yield
           duration = Time.now - start

data/lib/resque/plugins/job_stats/enqueued.rb

@@ -0,0 +1,33 @@
+module Resque
+  module Plugins
+    module JobStats
+
+      # Extend your job with this module to track how many
+      # jobs are queued successfully
+      module Enqueued
+
+        # Sets the number of jobs queued
+        def jobs_enqueued=(int)
+          Resque.redis.set(jobs_enqueued_key,int)
+        end
+
+        # Returns the number of jobs enqueued
+        def jobs_enqueued
+          Resque.redis.get(jobs_enqueued_key).to_i
+        end
+
+        # Returns the key used for tracking jobs enqueued
+        def jobs_enqueued_key
+          "stats:jobs:#{self.name}:enqueued"
+        end
+
+        # Increments the enqueued count when job is queued
+        def after_enqueue_job_stats_enqueued(*args)
+          Resque.redis.incr(jobs_enqueued_key)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/resque/plugins/job_stats/failed.rb

@@ -2,7 +2,7 @@ module Resque
   module Plugins
     module JobStats
 
-      # Extend your job with this module to track how many 
+      # Extend your job with this module to track how many
       # jobs fail
       module Failed
 
@@ -13,7 +13,9 @@ module Resque
 
         # Returns the number of jobs failed
         def jobs_failed
-          Resque.redis.get(jobs_failed_key).to_i
+          jobs_failed = Resque.redis.get(jobs_failed_key).to_i
+          return jobs_failed / 2 if Resque::VERSION == '1.20.0'
+          jobs_failed
         end
 
         # Returns the key used for tracking jobs failed
@@ -22,7 +24,7 @@ module Resque
         end
 
         # Increments the failed count when job is complete
-        def on_failure_job_stats_failed(e,*payload)
+        def on_failure_job_stats_failed(e,*args)
           Resque.redis.incr(jobs_failed_key)
         end
 

data/lib/resque/plugins/job_stats/performed.rb

@@ -2,7 +2,7 @@ module Resque
   module Plugins
     module JobStats
 
-      # Extend your job with this module to track how many 
+      # Extend your job with this module to track how many
       # jobs are performed successfully
       module Performed
 
@@ -22,7 +22,7 @@ module Resque
         end
 
         # Increments the performed count when job is complete
-        def after_perform_job_stats_performed(*payload)
+        def after_perform_job_stats_performed(*args)
           Resque.redis.incr(jobs_performed_key)
         end
 

data/lib/resque/plugins/job_stats/statistic.rb

@@ -0,0 +1,43 @@
+module Resque
+  module Plugins
+    module JobStats
+      # A class composed of a job class and the various job statistics
+      # collected for the given job.
+      class Statistic
+        include Comparable
+
+        # An array of the default statistics that will be displayed in the web tab
+        DEFAULT_STATS = [:jobs_enqueued, :jobs_performed, :jobs_failed, :job_rolling_avg, :longest_job]
+
+        attr_accessor *[:job_class].concat(DEFAULT_STATS)
+
+        class << self
+          # Find and load a Statistic for all resque jobs that are in the Resque::Plugins::JobStats.measured_jobs collection
+          def find_all(metrics)
+            Resque::Plugins::JobStats.measured_jobs.map{|j| new(j, metrics)}
+          end
+        end
+
+        # A series of metrics describing one job class.
+        def initialize(job_class, metrics)
+          self.job_class = job_class
+          self.load(metrics)
+        end
+
+        def load(metrics)
+          metrics.each do |metric|
+            self.send("#{metric}=", job_class.send(metric))
+          end
+        end
+
+        def name
+          self.job_class.name
+        end
+
+        def <=>(other)
+          self.name <=> other.name
+        end
+      end
+    end
+  end
+end

data/lib/resque/plugins/job_stats/timeseries.rb

@@ -0,0 +1,95 @@
+require 'time'
+
+module Resque
+  module Plugins
+    module JobStats
+
+      # Extend your job with this module to track how many
+      # jobs are performed over a period of time
+      module Timeseries
+
+        module Common
+          # A timestamp rounded to the lowest minute
+          def timestamp
+            time = Time.now.utc
+            Time.at(time.to_i - time.sec).utc   # to_i removes usecs
+          end
+
+          private
+
+          TIME_FORMAT = {:minutes => "%d:%H:%M", :hours => "%d:%H"}
+          FACTOR = {:minutes => 1, :hours => 60}
+
+          def range(sample_size, time_unit, end_time) # :nodoc:
+            (0..sample_size).map { |n| end_time - (n * 60 * FACTOR[time_unit])}
+          end
+
+          def timeseries_data(type, sample_size, time_unit) # :nodoc:
+            timeseries_range = range(sample_size, time_unit, timestamp)
+            timeseries_keys = timeseries_range.map { |time| jobs_timeseries_key(type, time, time_unit)}
+            timeseries_data = Resque.redis.mget(*(timeseries_keys))
+
+            return Hash[(0..sample_size).map { |i| [timeseries_range[i], timeseries_data[i].to_i]}]
+          end
+
+          def jobs_timeseries_key(type, key_time, time_unit) # :nodoc:
+            "#{prefix}:#{type}:#{key_time.strftime(TIME_FORMAT[time_unit])}"
+          end
+
+          def prefix # :nodoc:
+            "stats:jobs:#{self.name}:timeseries"
+          end
+
+          def incr_timeseries(type) # :nodoc:
+            increx(jobs_timeseries_key(type, timestamp, :minutes), (60 * 61)) # 1h + 1m for some buffer
+            increx(jobs_timeseries_key(type, timestamp, :hours), (60 * 60 * 25)) # 24h + 60m for some buffer
+          end
+
+          # Increments a key and sets its expiry time
+          def increx(key, ttl)
+            Resque.redis.incr(key)
+            Resque.redis.expire(key, ttl)
+          end
+        end
+      end
+    end
+  end
+end
+
+module Resque::Plugins::JobStats::Timeseries::Enqueued
+  include Resque::Plugins::JobStats::Timeseries::Common
+
+  # Increments the enqueued count for the timestamp when job is queued
+  def after_enqueue_job_stats_timeseries(*args)
+    incr_timeseries(:enqueued)
+  end
+
+  # Hash of timeseries data over the last 60 minutes for queued jobs
+  def queued_per_minute
+    timeseries_data(:enqueued, 60, :minutes)
+  end
+
+  # Hash of timeseries data over the last 24 hours for queued jobs
+  def queued_per_hour
+    timeseries_data(:enqueued, 24, :hours)
+  end
+end
+
+module Resque::Plugins::JobStats::Timeseries::Performed
+  include Resque::Plugins::JobStats::Timeseries::Common
+
+  # Increments the performed count for the timestamp when job is complete
+  def after_perform_job_stats_timeseries(*args)
+    incr_timeseries(:performed)
+  end
+
+  # Hash of timeseries data over the last 60 minutes for completed jobs
+  def performed_per_minute
+    timeseries_data(:performed, 60, :minutes)
+  end
+
+  # Hash of timeseries data over the last 24 hours for completed jobs
+  def performed_per_hour
+    timeseries_data(:performed, 24, :hours)
+  end
+end

data/resque-job-stats.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-job-stats"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["alanpeabody"]
-  s.date = "2011-11-07"
+  s.date = "2012-06-22"
   s.description = "Tracks jobs performed, failed, and the duration of the last 100 jobs for each job type."
   s.email = "gapeabody@gmail.com"
   s.extra_rdoc_files = [
@@ -26,18 +26,24 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/resque-job-stats.rb",
+    "lib/resque-job-stats/server.rb",
+    "lib/resque-job-stats/server/views/job_stats.erb",
     "lib/resque/plugins/job_stats.rb",
     "lib/resque/plugins/job_stats/duration.rb",
+    "lib/resque/plugins/job_stats/enqueued.rb",
     "lib/resque/plugins/job_stats/failed.rb",
     "lib/resque/plugins/job_stats/performed.rb",
+    "lib/resque/plugins/job_stats/statistic.rb",
+    "lib/resque/plugins/job_stats/timeseries.rb",
     "resque-job-stats.gemspec",
     "test/helper.rb",
-    "test/test_job_stats.rb"
+    "test/test_job_stats.rb",
+    "test/test_server.rb"
   ]
   s.homepage = "http://github.com/alanpeabody/resque-job-stats"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.17"
   s.summary = "Job-centric stats for Resque"
 
   if s.respond_to? :specification_version then
@@ -46,25 +52,28 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<resque>, ["~> 1.17"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<mynyml-redgreen>, ["~> 0.7.1"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
       s.add_dependency(%q<resque>, ["~> 1.17"])
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<mynyml-redgreen>, ["~> 0.7.1"])
+      s.add_dependency(%q<timecop>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
     end
   else
     s.add_dependency(%q<resque>, ["~> 1.17"])
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<mynyml-redgreen>, ["~> 0.7.1"])
+    s.add_dependency(%q<timecop>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -8,8 +8,11 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'minitest/unit'
+require 'minitest/mock'
+require 'rack/test'
 require 'redgreen'
 require 'resque'
+require 'timecop'
 
 Resque.redis = 'localhost:6379'
 Resque.redis.namespace = 'resque:job_stats'

data/test/test_job_stats.rb

@@ -17,7 +17,7 @@ class FailJob < BaseJob
   extend Resque::Plugins::JobStats::Failed
   @queue = :test
 
-  def self.perform(*payload)
+  def self.perform(*args)
     raise 'fail'
   end
 end
@@ -31,6 +31,8 @@ end
 class TestResqueJobStats < MiniTest::Unit::TestCase
 
   def setup
+    # Ensure empty redis for each test
+    Resque.redis.flushdb
     @worker = Resque::Worker.new(:test)
   end
 
@@ -51,6 +53,16 @@ class TestResqueJobStats < MiniTest::Unit::TestCase
     assert_equal 3, SimpleJob.jobs_performed
   end
 
+  def test_jobs_enqueued
+    assert_equal 'stats:jobs:SimpleJob:enqueued', SimpleJob.jobs_enqueued_key
+    SimpleJob.jobs_enqueued = 0
+    3.times do
+      Resque.enqueue(SimpleJob)
+      @worker.work(0)
+    end
+    assert_equal 3, SimpleJob.jobs_enqueued
+  end
+
   def test_jobs_failed
     assert_equal 'stats:jobs:FailJob:failed', FailJob.jobs_failed_key
     FailJob.jobs_failed = 0
@@ -97,4 +109,32 @@ class TestResqueJobStats < MiniTest::Unit::TestCase
     assert_in_delta 0.1, CustomDurJob.job_rolling_avg, 0.01
   end
 
+  def test_perform_timeseries
+    time = SimpleJob.timestamp
+    3.times do
+      Resque.enqueue(SimpleJob)
+      @worker.work(0)
+    end
+    assert_equal 3, SimpleJob.performed_per_minute[time]
+    assert_equal 0, SimpleJob.performed_per_minute[(time - 60)]
+
+    assert_equal 3, SimpleJob.performed_per_hour[time]
+    assert_equal 0, SimpleJob.performed_per_hour[(time - 3600)]
+  end
+
+  def test_enqueue_timeseries
+    time = SimpleJob.timestamp
+    Timecop.freeze(time)
+    Resque.enqueue(SimpleJob,0)
+    Timecop.freeze(time + 60)
+    @worker.work(0)
+    assert_equal 1, SimpleJob.queued_per_minute[time]
+    assert_equal 0, SimpleJob.queued_per_minute[(time + 60)]
+    assert_equal 1, SimpleJob.performed_per_minute[(time + 60)]
+    Timecop.return
+  end
+
+  def test_measured_jobs
+    assert_equal [SimpleJob], Resque::Plugins::JobStats.measured_jobs
+  end
 end

data/test/test_server.rb

@@ -0,0 +1,102 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'resque-job-stats/server'
+
+# A pretend job that has all of the statistics we want to display (i.e. extends 
+# Resque::Plugins::JobStats)
+class AnyJobber
+  class << self
+    def jobs_enqueued
+      111
+    end
+
+    def jobs_performed
+      12345
+    end
+
+    def jobs_failed
+      0
+    end
+
+    def job_rolling_avg
+      0.3333232
+    end
+
+    def longest_job
+      0.455555
+    end
+  end
+end
+
+class YetAnotherJobber < AnyJobber
+end
+
+class MyServer
+  def self.job_stats_to_display
+    [:jobs_enqueued]
+  end
+
+  include Resque::Plugins::JobStats::Server::Helpers
+end
+
+ENV['RACK_ENV'] = 'test'
+class TestServer < MiniTest::Unit::TestCase
+  include Rack::Test::Methods
+
+  def setup
+    Resque::Server.job_stats_to_display = Resque::Plugins::JobStats::Statistic::DEFAULT_STATS 
+    @server = MyServer.new
+  end
+
+  def app
+    Resque::Server
+  end
+
+  def test_job_stats
+    Resque::Plugins::JobStats.stub :measured_jobs, [AnyJobber] do
+      get '/job_stats'
+      assert_equal 200, last_response.status, last_response.body
+      assert last_response.body.include?("<td>AnyJobber</td>"), "job name was not found"
+      assert last_response.body.include?("<td>111</td>"), "jobs_enqueued was not found"
+      assert last_response.body.include?("<td>12345</td>"), "jobs_performed was not found"
+      assert last_response.body.include?("<td></td>"), "jobs_failed was not found"
+      assert last_response.body.include?("<td>0.33s</td>"),  "job_rolling_avg was not found"
+      assert last_response.body.include?("<td>0.46s</td>"), "longest_job was not found"
+    end
+  end
+
+  def test_job_stats_filtered
+    Resque::Server.job_stats_to_display = [:longest_job]
+    Resque::Plugins::JobStats.stub :measured_jobs, [AnyJobber] do
+      get '/job_stats'
+      assert_equal 200, last_response.status, last_response.body
+      assert last_response.body.include?("<td>AnyJobber</td>"), "job name was not found"
+      assert !last_response.body.include?("<td>111</td>"), "jobs_enqueued was not found"
+      assert !last_response.body.include?("<td>12345</td>"), "jobs_performed was not found"
+      assert !last_response.body.include?("<td></td>"), "jobs_failed was not found"
+      assert !last_response.body.include?("<td>0.33s</td>"),  "job_rolling_avg was not found"
+      assert last_response.body.include?("<td>0.46s</td>"), "longest_job was not found"
+    end
+  end
+
+  def test_stat_header
+    assert_equal "<th>Jobs enqueued</th>", @server.stat_header(:jobs_enqueued)
+    assert_equal nil, @server.stat_header(:FOOOOOOO)
+  end
+
+  def test_display_stat?
+    assert !@server.display_stat?(:jobs_barfing)
+    assert @server.display_stat?(:jobs_enqueued)
+  end
+
+  def test_job_sorting
+    Resque::Plugins::JobStats.stub :measured_jobs, [YetAnotherJobber, AnyJobber] do
+      get '/job_stats'
+      assert_equal 200, last_response.status, last_response.body
+      assert(last_response.body =~ /AnyJobber(.|\n)+YetAnotherJobber/, "AnyJobber should be found before YetAnotherJobber")
+    end
+  end
+
+  def test_tabs
+    assert app.tabs.include?("Job_Stats"), "The tab should be in resque's server"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-job-stats
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000Z
+date: 2012-06-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &16247440 !ruby/object:Gem::Requirement
+  requirement: &70220064841520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.17'
   type: :runtime
   prerelease: false
-  version_requirements: *16247440
+  version_requirements: *70220064841520
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &16246940 !ruby/object:Gem::Requirement
+  requirement: &70220064841040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +32,43 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16246940
+  version_requirements: *70220064841040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16246320 !ruby/object:Gem::Requirement
+  requirement: &70220064840560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *16246320
+  version_requirements: *70220064840560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16245720 !ruby/object:Gem::Requirement
+  requirement: &70220064840080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *16245720
+  version_requirements: *70220064840080
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &16245220 !ruby/object:Gem::Requirement
+  name: mynyml-redgreen
+  requirement: &70220064839600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: *70220064839600
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70220064839120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +76,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16245220
+  version_requirements: *70220064839120
 - !ruby/object:Gem::Dependency
-  name: mynyml-redgreen
-  requirement: &16244740 !ruby/object:Gem::Requirement
+  name: rack-test
+  requirement: &70220064838640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16244740
+  version_requirements: *70220064838640
 description: Tracks jobs performed, failed, and the duration of the last 100 jobs
   for each job type.
 email: gapeabody@gmail.com
@@ -95,13 +106,19 @@ files:
 - Rakefile
 - VERSION
 - lib/resque-job-stats.rb
+- lib/resque-job-stats/server.rb
+- lib/resque-job-stats/server/views/job_stats.erb
 - lib/resque/plugins/job_stats.rb
 - lib/resque/plugins/job_stats/duration.rb
+- lib/resque/plugins/job_stats/enqueued.rb
 - lib/resque/plugins/job_stats/failed.rb
 - lib/resque/plugins/job_stats/performed.rb
+- lib/resque/plugins/job_stats/statistic.rb
+- lib/resque/plugins/job_stats/timeseries.rb
 - resque-job-stats.gemspec
 - test/helper.rb
 - test/test_job_stats.rb
+- test/test_server.rb
 homepage: http://github.com/alanpeabody/resque-job-stats
 licenses:
 - MIT
@@ -117,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2761321648121208305
+      hash: 1776259179691476593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Job-centric stats for Resque