dj_dashboard 0.0.7 → 0.0.8

data/Gemfile

@@ -7,6 +7,7 @@ gem "capybara", ">= 0.4.0"
 gem "sqlite3"
 gem 'delayed_job'
 gem 'haml'
+gem 'will_paginate'
 
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
 # gem 'ruby-debug'

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    dj_dashboard (0.0.7)
+    dj_dashboard (0.0.8)
       delayed_job
       haml
       rails (~> 3.0)
       sass
+      will_paginate
 
 GEM
   remote: http://rubygems.org/
@@ -108,7 +109,7 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.7.0)
     rubyzip (0.9.5)
-    sass (3.1.11)
+    sass (3.1.12)
     selenium-webdriver (2.15.0)
       childprocess (>= 0.2.1)
       ffi (~> 1.0.9)
@@ -121,6 +122,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
+    will_paginate (3.0.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -139,3 +141,4 @@ DEPENDENCIES
   rspec-rails
   shoulda
   sqlite3
+  will_paginate

data/README.md

@@ -17,7 +17,6 @@ Add to your Gemfile:
 Then run:
 
     rake dj_dashboard:install
-    rake db:migrate
 
 Installation may take several minutes if you have a lot of existing jobs (50k+).
 

data/app/controllers/dj_dashboard/jobs_controller.rb

@@ -7,5 +7,17 @@ module DjDashboard
     def index
       @jobs = Job.fetch
     end
+
+    def stats
+      @jobs = Delayed::Job.send(params[:type].to_sym, params[:job_name]).page(params[:page]).per_page(10)
+      @is_pagination_link = params[:page] ? true : false
+      @job_name = @jobs.first.job_name if @jobs.any?
+      @stat_type = params[:type]
+
+      respond_to do |format|
+        format.html
+        format.js
+      end
+    end
   end
 end

data/app/models/dj_dashboard/job.rb

@@ -7,10 +7,10 @@ module DjDashboard
       jobs.map do |job|
         {
           name:     job.job_name,
-          running:  Delayed::Job.where(job_name: job.job_name).where("locked_at is not null").count,
-          failed:   Delayed::Job.where(job_name: job.job_name).where("failed_at is not null and attempts >= 3").count,
-          pending:  Delayed::Job.where(job_name: job.job_name).where(locked_at: nil, failed_at: nil).count,
-          retrying: Delayed::Job.where(job_name: job.job_name).where(locked_at: nil).where("failed_at is not null").count
+          running: Delayed::Job.running(job.job_name).count,
+          failed:   Delayed::Job.failed(job.job_name).count,
+          pending:  Delayed::Job.pending(job.job_name).count,
+          retrying: Delayed::Job.retrying(job.job_name).count
         }
       end
     end

data/app/views/dj_dashboard/jobs/_stats.html.haml

@@ -0,0 +1,20 @@
+%tr.stats{:class => "#{@stat_type.to_s}", :id => "stats_#{@job_name.gsub('::', '__')}"}
+  %td{:colspan => 5}
+    %h3= "#{@stat_type.to_s.capitalize} Jobs"
+    #job_pagination= will_paginate(@jobs)
+    %table.stat
+      %tr.header
+        %td Priority
+        %td Created
+        %td Run
+        %td Locked
+        %td Attempts
+        %td Failed
+      - @jobs.each.with_index do |job, index|
+        %tr{:class => "#{index % 2 === 0 ? 'striped' : nil}"}
+          %td.center= job.priority
+          %td= "#{time_ago_in_words job.created_at} ago"
+          %td= job.run_at ? "#{time_ago_in_words job.run_at} ago" : "--"
+          %td= job.locked_at ? "#{time_ago_in_words job.locked_at} ago" : "--"
+          %td.center= job.attempts
+          %td= job.failed_at ? "#{time_ago_in_words job.failed_at} ago" : "--"

data/app/views/dj_dashboard/jobs/index.html.haml

@@ -8,12 +8,12 @@
       %td.header Retrying
       %td.header.right Failed
       - @jobs.each.with_index do |job, index|
-        %tr{ :class => "#{index % 2 === 0 ? 'striped' : ''}" }
-          %td.col.left= job[:name]
-          %td.col= number_with_delimiter(job[:running])
-          %td.col= number_with_delimiter(job[:pending])
-          %td.col= number_with_delimiter(job[:retrying])
-          %td.col= number_with_delimiter(job[:failed])
+        %tr{ :id => "job_#{job[:name].gsub('::','__')}", :class => "#{index % 2 === 0 ? 'striped' : ''}" }
+          %td.col.all.left= link_to job[:name], dj_dashboard_job_stats_path(:job_name => job[:name], :type => :all), :remote => true
+          %td.col.running= link_to_if (job[:running] > 0), number_with_delimiter(job[:running]), dj_dashboard_job_stats_path(:job_name => job[:name], :type => :running), :remote => true
+          %td.col.pending= link_to_if (job[:pending] > 0), number_with_delimiter(job[:pending]), dj_dashboard_job_stats_path(:job_name => job[:name], :type => :pending), :remote => true
+          %td.col.retrying= link_to_if (job[:retrying] > 0), number_with_delimiter(job[:retrying]), dj_dashboard_job_stats_path(:job_name => job[:name], :type => :retrying), :remote => true
+          %td.col.failed= link_to_if (job[:failed] > 0), number_with_delimiter(job[:failed]), dj_dashboard_job_stats_path(:job_name => job[:name], :type => :failed), :remote => true
       %tr
         %td.total
         %td.total= number_with_delimiter @jobs.map { |j| j[:running] }.sum

data/app/views/dj_dashboard/jobs/stats.js.erb

@@ -0,0 +1,10 @@
+var job = $('#job_<%= @job_name.gsub('::', '__') %>')
+var stats = $('#stats_<%= @job_name.gsub('::', '__') %>')
+var stats_type = $('#stats_<%= @job_name.gsub('::', '__') %>.stats.<%= @stat_type.to_s %>')
+
+stats.remove();
+if(stats_type.size() === 0 || <%= @is_pagination_link %>) {
+  job.after("<%= escape_javascript(render('stats')) %>")
+}
+
+$('.pagination a').attr('data-remote', true);

data/app/views/layouts/dj_dashboard.html.haml

@@ -1,6 +1,7 @@
 !!! 5
 %head
   %title Delayed Job Dashboard
+  = javascript_include_tag :defaults
   = stylesheet_link_tag('dj_dashboard/jobs.css')
   = javascript_include_tag('dj_dashboard/jobs.js')
 %body

data/config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
   get "dj_dashboard" => "dj_dashboard/jobs#index", :as => :dj_dashboard
+  get "dj_dashboard/jobs/stats" => "dj_dashboard/jobs#stats", :as => :dj_dashboard_job_stats
 end

data/dj_dashboard.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "haml"
   s.add_dependency "sass"
   s.add_dependency "delayed_job"
+  s.add_dependency "will_paginate"
   s.add_dependency "rails", '~> 3.0'
 
   s.add_development_dependency "sqlite3"

data/lib/dj_dashboard.rb

@@ -1,6 +1,7 @@
 require 'active_support/dependencies'
 require 'haml'
 require 'delayed_job'
+require 'will_paginate'
 
 module DjDashboard
 

data/lib/dj_dashboard/tasks/install.rb

@@ -11,26 +11,28 @@ module DjDashboard
         run_migrations
       end
 
+      # TODO: This is wierd...
       def self.copy_assets_files
+        puts 'now copying assets'
         return nil if Rails.version =~ /3.0/ # not needed for rails 3.0
         origin = File.join(gem_path, 'public')
         destination = Rails.root.join('app/assets') if Rails.version =~ /3.1/
         destination = Rails.root.join('public') if Rails.version =~ /3.0/
-        puts copy_files(%w( stylesheets images javascripts ), origin, destination, 'dj_dashboard')
+        copy_files(%w( stylesheets images javascripts ), origin, destination, 'dj_dashboard')
       end
 
       def self.copy_db_files
         puts 'now copying db files'
         origin = File.join(gem_path, 'db')
         destination = Rails.root.join('db')
-        puts copy_files(%w( migrate ), origin, destination)
+        copy_files(%w( migrate ), origin, destination)
       end
 
       def self.copy_config_files
         puts 'now copying initializer file'
         origin = File.join(gem_path, 'config')
         destination = Rails.root.join('config')        
-        puts copy_files(%w( initializers ), origin, destination)
+        copy_files(%w( initializers ), origin, destination)
       end
 
       def self.gem_path
@@ -64,6 +66,7 @@ module DjDashboard
       end
 
       def self.run_migrations
+        puts 'now running migrations'
         Rake::Task['db:migrate'].invoke
       end
 

data/lib/dj_dashboard/version.rb

@@ -1,3 +1,3 @@
 module DjDashboard
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/ext/delayed_job.rb

@@ -8,6 +8,26 @@ module Delayed
           job.update_attributes(job_name: job.name)
           job
         end
+
+        def running(job_name = nil)
+          running = job_name ? where(job_name: job_name) : scoped
+          running.where("locked_at is not null").where(:attempts => 0)
+        end
+
+        def failed(job_name = nil)
+          failed = job_name ? where(job_name: job_name) : scoped
+          failed.where("failed_at is not null and attempts >= 3")
+        end
+
+        def pending(job_name = nil)
+          pending = job_name ? where(job_name: job_name) : scoped
+          pending.where(locked_at: nil, failed_at: nil)
+        end
+    
+        def retrying(job_name = nil)
+          retrying = job_name ? where(job_name: job_name) : scoped
+          retrying.where(locked_at: nil).where("failed_at is not null").where("attempts < 3")
+        end
       end
     end
   end

data/public/stylesheets/dj_dashboard/jobs.css

@@ -6,4 +6,29 @@ body { font-family: Arial; color: #fff; background-color: #333 }
 .col { padding: 15px; font-size: 18px; text-align: center; color: #999; }
 tr.striped { background-color: #292929; }
 .col.left { text-align: left; }
+.col.running a { color: #74916A; text-decoration: none; }
+.col.pending a { color: #CFBE5F; text-decoration: none; }
+.col.retrying a { color: #D49E3B; text-decoration: none; }
+.col.failed a { color: #CF5355; text-decoration: none; }
+.col.all a { color: #999; text-decoration: none; }
+.col a:hover { text-decoration: underline; }
 .total { text-align: center; font-weight: bold; border-top: 2px solid #888; padding: 20px; }
+
+.stats td { padding: 20px; background-color: #999; height: 385px; vertical-align: top; color: #333; }
+.stats td h3 { color: #fff; text-shadow: 1px 2px #333; font-size: 19px; margin: 0 0 20px 0; float: left; }
+.stats.running td { background-color: #8BAB80; }
+.stats.running td .stat tr.striped td { background-color: #74916A; }
+.stats.pending td { background-color: #E8D672; }
+.stats.pending td .stat tr.striped td { background-color: #CFBE5F; }
+.stats.retrying td { background-color: #F0B954; }
+.stats.retrying td .stat tr.striped td { background-color: #D49E3B; }
+.stats.failed td { background-color: #F06063; }
+.stats.failed td .stat tr.striped td { background-color: #CF5355; }
+.stats td .stat { width: 100%; border-collapse: collapse; }
+.stats td .stat tr.header { border-bottom: 2px solid #333; }
+.stats td .stat tr.header td { border: none; font-size: 15px; text-align: left; font-weight: bold; }
+.stats td .stat td { height: 24px; font-size: 13px; padding: 5px 10px 5px 10px; border-bottom: 1px solid #333; }
+.center { text-align: center }
+
+#job_pagination { float: right; font-size: 13px; }
+#job_pagination a { color: #fff; text-shadow: 1px 1px #666; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dj_dashboard
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2012-01-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70212829934080 !ruby/object:Gem::Requirement
+  requirement: &70130000392180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212829934080
+  version_requirements: *70130000392180
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70212829932360 !ruby/object:Gem::Requirement
+  requirement: &70130000391460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212829932360
+  version_requirements: *70130000391460
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70212829930820 !ruby/object:Gem::Requirement
+  requirement: &70130000390760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212829930820
+  version_requirements: *70130000390760
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: &70130000390100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70130000390100
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70212829929660 !ruby/object:Gem::Requirement
+  requirement: &70130000388980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212829929660
+  version_requirements: *70130000388980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70212829928480 !ruby/object:Gem::Requirement
+  requirement: &70130000387600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212829928480
+  version_requirements: *70130000387600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70212829927720 !ruby/object:Gem::Requirement
+  requirement: &70130000386140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212829927720
+  version_requirements: *70130000386140
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70212829927200 !ruby/object:Gem::Requirement
+  requirement: &70130000384580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212829927200
+  version_requirements: *70130000384580
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70212829926420 !ruby/object:Gem::Requirement
+  requirement: &70130000383700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212829926420
+  version_requirements: *70130000383700
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70212829925520 !ruby/object:Gem::Requirement
+  requirement: &70130000382560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70212829925520
+  version_requirements: *70130000382560
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70212829924940 !ruby/object:Gem::Requirement
+  requirement: &70130000381720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212829924940
+  version_requirements: *70130000381720
 description: Delayed Job Dashboard
 email:
 - ben.kempner@gmail.com
@@ -137,7 +148,9 @@ files:
 - Rakefile
 - app/controllers/dj_dashboard/jobs_controller.rb
 - app/models/dj_dashboard/job.rb
+- app/views/dj_dashboard/jobs/_stats.html.haml
 - app/views/dj_dashboard/jobs/index.html.haml
+- app/views/dj_dashboard/jobs/stats.js.erb
 - app/views/layouts/dj_dashboard.html.haml
 - config/initializers/dj_dashboard.rb
 - config/routes.rb
@@ -212,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2640301045582584717
+      hash: 2548906427269125101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2640301045582584717
+      hash: 2548906427269125101
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6