dj_dashboard 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dj_dashboard (0.0.5)
+    dj_dashboard (0.0.6)
       delayed_job
       haml
       rails (~> 3.0)

data/README.md

@@ -0,0 +1,50 @@
+# DjDashboard
+
+The missing dashboard for delayed_job.
+
+Tested with Ruby 1.9.2, Rails 3.0+
+
+# Screenshots
+
+Coming soon...
+
+# Installation
+
+Add to your Gemfile:
+
+    gem 'dj_dashboard'
+
+Then run:
+
+    rake dj_dashboard:install
+    rake db:migrate
+
+Installation may take several minutes if you have a lot of existing jobs (50k+).
+
+# Usage
+
+Start the server:
+
+    rails s
+
+View the dashboard at: http://localhost:3000/dj_dashboard
+
+# Authentication
+
+The installer will create an initializer in app/config/initializers/dj_dashboard.rb
+
+In the initializer, you can define any auth logic that will be used by the controller's before_filter callback.
+
+Below is an example using devise:
+
+    module DjDashboard
+      class ApplicationController < ActionController::Base
+        def authenticate!
+          redirect_to new_user_session_url unless user_signed_in?
+        end
+      end
+    end
+
+# License
+
+This project uses MIT-LICENSE.

data/app/controllers/dj_dashboard/jobs_controller.rb

@@ -2,9 +2,10 @@ module DjDashboard
   class JobsController < ApplicationController
     layout 'dj_dashboard'
 
+    before_filter :authenticate!
+
     def index
       @jobs = Job.fetch
     end
-  
   end
 end

data/app/models/dj_dashboard/job.rb

@@ -3,18 +3,14 @@ require 'set'
 module DjDashboard
   class Job
     def self.fetch(opts={})
-      results = Delayed::Job.select(:handler).group(:handler)
-      names = results.reduce(Set.new) do |names, result|
-        names << result[:handler].chomp.scan(/ruby\/\w+:([a-zA-Z:]+)\ /).flatten.first
-      end
-
-      names.map do |job|
+      jobs = Delayed::Job.select(:job_name).group(:job_name)
+      jobs.map do |job|
         {
-          name:     job,
-          running:  Delayed::Job.where("handler like '%#{job}%'").where("locked_at is not null").count,
-          failed:   Delayed::Job.where("handler like '%#{job}%'").where("failed_at is not null and attempts >= 3").count,
-          pending:  Delayed::Job.where("handler like '%#{job}%'").where(locked_at: nil, failed_at: nil).count,
-          retrying: Delayed::Job.where("handler like '%#{job}%'").where(locked_at: nil).where("failed_at is not null").count
+          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
         }
       end
     end

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

@@ -1,5 +1,5 @@
 %div
-  .title Current Jobs
+  .title Delayed Jobs
   %table#jobs
     %tr
       %td.header.left Job
@@ -10,14 +10,14 @@
       - @jobs.each.with_index do |job, index|
         %tr{ :class => "#{index % 2 === 0 ? 'striped' : ''}" }
           %td.col.left= job[:name]
-          %td.col= job[:running]
-          %td.col= job[:pending]
-          %td.col= job[:retrying]
-          %td.col= job[:failed]
+          %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
         %td.total
-        %td.total= @jobs.map { |j| j[:running] }.sum
-        %td.total= @jobs.map { |j| j[:pending] }.sum
-        %td.total= @jobs.map { |j| j[:retrying] }.sum
-        %td.total= @jobs.map { |j| j[:failed] }.sum
+        %td.total= number_with_delimiter @jobs.map { |j| j[:running] }.sum
+        %td.total= number_with_delimiter @jobs.map { |j| j[:pending] }.sum
+        %td.total= number_with_delimiter @jobs.map { |j| j[:retrying] }.sum
+        %td.total= number_with_delimiter @jobs.map { |j| j[:failed] }.sum
 

data/config/initializers/dj_dashboard.rb

@@ -0,0 +1,10 @@
+module DjDashboard
+  class ApplicationController < ActionController::Base
+    def authenticate!
+      # custom auth logic here
+      # 
+      # example using devise:
+      # redirect_to new_user_session_url unless user_signed_in?
+    end
+  end
+end

data/db/migrate/20111213032010_add_job_name_to_delayed_jobs.rb

@@ -0,0 +1,15 @@
+class AddJobNameToDelayedJobs < ActiveRecord::Migration
+  def self.up
+    add_column :delayed_jobs, :job_name, :string
+    add_index :delayed_jobs, :job_name
+  
+    # populate name field with job class name
+    Delayed::Job.find_each do |job|
+      job.update_attributes(job_name: job.name)
+    end
+  end
+
+  def self.down
+    remove_column :delayed_jobs, :job_name
+  end
+end

data/lib/dj_dashboard.rb

@@ -13,3 +13,4 @@ module DjDashboard
 end
 
 require 'dj_dashboard/engine'
+require 'ext/delayed_job'

data/lib/dj_dashboard/tasks/install.rb

@@ -6,7 +6,8 @@ module DjDashboard
       def self.run
         puts 'installing dj_dashboard'
         copy_assets_files
-        copy_migration_files
+        copy_db_files
+        copy_config_files
       end
 
       def self.copy_assets_files
@@ -17,13 +18,20 @@ module DjDashboard
         puts copy_files(%w( stylesheets images javascripts ), origin, destination, 'dj_dashboard')
       end
 
-      def self.copy_migration_files
-        puts 'now copying migration files'
+      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)
       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)
+      end
+
       def self.gem_path
         File.expand_path('../../..', File.dirname(__FILE__))
       end

data/lib/dj_dashboard/version.rb

@@ -1,3 +1,3 @@
 module DjDashboard
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/ext/delayed_job.rb

@@ -0,0 +1,14 @@
+module Delayed
+  module Backend
+    module Base
+      module ClassMethods
+        alias_method :old_enqueue, :enqueue
+        def enqueue(*args)
+          job = old_enqueue(*args)
+          job.update_attributes(job_name: job.name)
+          job
+        end
+      end
+    end
+  end
+end

data/lib/tasks/install.rake

@@ -3,6 +3,8 @@ require File.expand_path('../../dj_dashboard/tasks/install', __FILE__)
 namespace :dj_dashboard do
   desc "Install dj_dashboard"
   task :install do
+    puts "Installing dj_dashboard"
+    puts "This may take several minutes if you have lots of existing jobs."
     DjDashboard::Tasks::Install.run
   end
 end

data/test/dummy/config/initializers/dj_dashboard.rb

@@ -0,0 +1,10 @@
+module DjDashboard
+  class ApplicationController < ActionController::Base
+    def authenticate!
+      # custom auth logic here
+      # 
+      # example using devise:
+      # redirect_to new_user_session_url unless user_signed_in?
+    end
+  end
+end

data/test/dummy/db/migrate/20111212074858_add_indexes_on_delayed_job.rb

@@ -0,0 +1,15 @@
+class AddIndexesOnDelayedJob < ActiveRecord::Migration
+  def self.up
+    add_index :delayed_jobs, :locked_at
+    add_index :delayed_jobs, :failed_at
+    add_index :delayed_jobs, [:locked_at, :failed_at]
+    add_index :delayed_jobs, [:failed_at, :attempts]
+  end
+
+  def self.down
+    remove_index :delayed_jobs, :locked_at
+    remove_index :delayed_jobs, :failed_at
+    remove_index :delayed_jobs, [:locked_at, :failed_at]
+    remove_index :delayed_jobs, [:failed_at, :attempts]
+  end
+end

data/test/dummy/db/migrate/20111213032010_add_job_name_to_delayed_jobs.rb

@@ -0,0 +1,15 @@
+class AddJobNameToDelayedJobs < ActiveRecord::Migration
+  def self.up
+    add_column :delayed_jobs, :job_name, :string
+    add_index :delayed_jobs, :job_name
+  
+    # populate name field with job class name
+    Delayed::Job.find_each do |job|
+      job.update_attributes(job_name: job.name)
+    end
+  end
+
+  def self.down
+    remove_column :delayed_jobs, :job_name
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111212042040) do
+ActiveRecord::Schema.define(:version => 20111213032010) do
 
   create_table "delayed_jobs", :force => true do |t|
     t.integer  "priority",   :default => 0
@@ -24,8 +24,14 @@ ActiveRecord::Schema.define(:version => 20111212042040) do
     t.string   "locked_by"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "job_name"
   end
 
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+  add_index "delayed_jobs", ["failed_at", "attempts"], :name => "index_delayed_jobs_on_failed_at_and_attempts"
+  add_index "delayed_jobs", ["failed_at"], :name => "index_delayed_jobs_on_failed_at"
+  add_index "delayed_jobs", ["job_name"], :name => "index_delayed_jobs_on_job_name"
+  add_index "delayed_jobs", ["locked_at", "failed_at"], :name => "index_delayed_jobs_on_locked_at_and_failed_at"
+  add_index "delayed_jobs", ["locked_at"], :name => "index_delayed_jobs_on_locked_at"
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "altered_delayed_jobs_priority"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dj_dashboard
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70128177353460 !ruby/object:Gem::Requirement
+  requirement: &70247966674500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128177353460
+  version_requirements: *70247966674500
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70128177352460 !ruby/object:Gem::Requirement
+  requirement: &70247966673380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128177352460
+  version_requirements: *70247966673380
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70128177351280 !ruby/object:Gem::Requirement
+  requirement: &70247966672240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128177351280
+  version_requirements: *70247966672240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70128177350480 !ruby/object:Gem::Requirement
+  requirement: &70247966671560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128177350480
+  version_requirements: *70247966671560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70128177349880 !ruby/object:Gem::Requirement
+  requirement: &70247966670920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128177349880
+  version_requirements: *70247966670920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70128177349200 !ruby/object:Gem::Requirement
+  requirement: &70247966670240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128177349200
+  version_requirements: *70247966670240
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70128177348580 !ruby/object:Gem::Requirement
+  requirement: &70247966669580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128177348580
+  version_requirements: *70247966669580
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70128177347740 !ruby/object:Gem::Requirement
+  requirement: &70247966668880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128177347740
+  version_requirements: *70247966668880
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70128177346940 !ruby/object:Gem::Requirement
+  requirement: &70247966667960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70128177346940
+  version_requirements: *70247966667960
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70128177346200 !ruby/object:Gem::Requirement
+  requirement: &70247966667160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128177346200
+  version_requirements: *70247966667160
 description: Delayed Job Dashboard
 email:
 - ben.kempner@gmail.com
@@ -132,19 +132,22 @@ files:
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - app/controllers/dj_dashboard/jobs_controller.rb
 - app/models/dj_dashboard/job.rb
 - app/views/dj_dashboard/jobs/index.html.haml
 - app/views/layouts/dj_dashboard.html.haml
+- config/initializers/dj_dashboard.rb
 - config/routes.rb
 - db/migrate/20111212074858_add_indexes_on_delayed_job.rb
+- db/migrate/20111213032010_add_job_name_to_delayed_jobs.rb
 - dj_dashboard.gemspec
 - lib/dj_dashboard.rb
 - lib/dj_dashboard/engine.rb
 - lib/dj_dashboard/tasks/install.rb
 - lib/dj_dashboard/version.rb
+- lib/ext/delayed_job.rb
 - lib/tasks/install.rake
 - public/javascripts/dj_dashboard/jobs.js
 - public/stylesheets/dj_dashboard/jobs.css
@@ -166,6 +169,7 @@ files:
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/dj_dashboard.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
@@ -173,6 +177,8 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20111212042040_create_delayed_jobs.rb
+- test/dummy/db/migrate/20111212074858_add_indexes_on_delayed_job.rb
+- test/dummy/db/migrate/20111213032010_add_job_name_to_delayed_jobs.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -205,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1105974597055427148
+      hash: 120191758946631102
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1105974597055427148
+      hash: 120191758946631102
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
@@ -240,6 +246,7 @@ test_files:
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/dj_dashboard.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
@@ -247,6 +254,8 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20111212042040_create_delayed_jobs.rb
+- test/dummy/db/migrate/20111212074858_add_indexes_on_delayed_job.rb
+- test/dummy/db/migrate/20111213032010_add_job_name_to_delayed_jobs.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html

data/README.rdoc

@@ -1,3 +0,0 @@
-= DjDashboard
-
-This project rocks and uses MIT-LICENSE.