dj_mon 0.1.1 → 0.1.3

data/README.md

@@ -1,14 +1,7 @@
-# DJ Mon
+# DJ Mon [![Build Status](https://secure.travis-ci.org/akshayrawat/dj_mon.png)](http://travis-ci.org/akshayrawat/dj_mon)
 
 A Rails engine based frontend for Delayed Job.
 
-## Demo
-* [Demo URL](http://dj-mon-demo.herokuapp.com/)
-* Username: `dj_mon`
-* Password: `password`
-* [Demo Source](https://github.com/akshayrawat/dj_mon_demo)
-
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,7 +17,8 @@ Or install it yourself as:
     $ gem install dj_mon
 
 ## Note
-Supports only `activerecord` for now.
+
+Supports only `activerecord` and `mongoid` for now.
 
 ## Usage
 
@@ -45,16 +39,23 @@ If the credentials are not set, then the username and password are assumed to be
 
 Now visit `http://localhost:3000/dj_mon` and profit!
   
+
 ## Demo
-* Source [DJ Mon](https://github.com/akshayrawat/dj_mon)
-* URL:     [Demo](http://dj-mon-demo.herokuapp.com/)
+
+* [Demo URL](http://dj-mon-demo.herokuapp.com/)
 * Username: `dj_mon`
-* Password: `password`  
+* Password: `password`
+* [Demo Source](https://github.com/akshayrawat/dj_mon_demo)
+
+![Screenshot](https://github.com/akshayrawat/dj_mon_demo/raw/master/docs/screenshot.jpg)
+
+
+## Running the test suite
 
-## Contributing
+To run the test suite, execute the following commands on the project
+root:
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+    gem install bundler
+    bundle install
+    rake test:prepare
+    rake

data/Rakefile

@@ -7,18 +7,38 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+namespace :test do
+
+  desc "Run all tests for the ActiveRecord backend"
+  Rake::TestTask.new(:active_record) do |t|
+    t.pattern = 'test/**/*_test.rb'
+    t.libs = [ "test/dummy_active_record" ]
+  end
+
+  desc "Run all tests for the Mongoid backend"
+  Rake::TestTask.new(:mongoid) do |t|
+    t.pattern = 'test/**/*_test.rb'
+    t.libs = [ "test/dummy_mongoid" ]
+  end
+
+  desc "Runs all tests"
+  task "all"=> [ :active_record, :mongoid ]
+
+  desc "Prepare environment for tests"
+  task :prepare do
+    FileUtils.cd File.expand_path("../test/dummy_active_record", __FILE__)
+    system("rake db:create:all")
+    system("rake db:migrate")
+    system("rake db:test:clone")
+  end
+
 end
 
-task :default => :test
+task default: 'test:all'
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -27,3 +47,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+

data/app/assets/javascripts/dj_mon.js

@@ -39,7 +39,7 @@ $(function(){
   });
 
   (function refreshCount() {
-    $.getJSON('/dj_mon/dj_reports/dj_counts/').success(function(data){
+    $.getJSON(dj_counts_dj_reports_url).success(function(data){
       var template = $('#dj_counts_template').html();
       var output = Mustache.render(template, data);
       $('#dj-counts-view').html(output);

data/app/assets/stylesheets/dj_mon.css

@@ -4,6 +4,15 @@ body {
   padding: 90px;
 }
 
+.container {
+  width: 980px;
+}
+
+.navbar .btn#settings {
+  margin: 8px 5px 5px;
+  padding: 1px 10px 1px;
+}
+
 table#jobs-table td, table#jobs-table th {
   text-align: center;
 }
@@ -38,4 +47,4 @@ code.block {
 
 form.form-inline {
   display: inline;
-}
+}

data/app/controllers/dj_mon/dj_reports_controller.rb

@@ -1,9 +1,10 @@
 module DjMon
   class DjReportsController < ActionController::Base
-    respond_to :json
+    respond_to :json, :html
     layout 'dj_mon'
-    
+
     before_filter :authenticate
+    after_filter :set_api_version
 
     def index
     end
@@ -23,27 +24,31 @@ module DjMon
     def queued
       respond_with DjReport.queued_reports
     end
-    
+
     def dj_counts
       respond_with DjReport.dj_counts
     end
-    
+
     def settings
       respond_with DjReport.settings
     end
-    
+
     def retry
-      dj = Delayed::Job.find(params[:id])
-      dj.update_attribute :failed_at, nil if dj
-      redirect_to root_url, notice: "The job was been queued for a re-run" and return
+      DjMon::Backend.retry params[:id]
+      respond_to do |format|
+        format.html { redirect_to root_url, notice: "The job has been queued for a re-run" and return }
+        format.json { head(:ok) }
+      end
     end
-  
+
     def destroy
-      dj = Delayed::Job.find(params[:id])
-      dj.destroy if dj
-      redirect_to root_url, notice: "The job was deleted" and return
+      DjMon::Backend.destroy params[:id]
+      respond_to do |format|
+        format.html { redirect_to root_url, notice: "The job was deleted" and return }
+        format.json { head(:ok) }
+      end
     end
-  
+
     protected
 
     def authenticate
@@ -52,6 +57,11 @@ module DjMon
         password == Rails.configuration.dj_mon.password
       end
     end
+
+    def set_api_version
+      response.headers['DJ-Mon-Version'] = DjMon::VERSION
+    end
+
   end
 
 end

data/app/models/dj_mon/dj_report.rb

@@ -1,5 +1,6 @@
 module DjMon
   class DjReport
+    TIME_FORMAT = "%b %d %H:%M:%S"
 
     attr_accessor :delayed_job
 
@@ -10,7 +11,7 @@ module DjMon
     def as_json(options={})
       { 
         id: delayed_job.id,
-        payload: delayed_job.payload_object.object.to_yaml,
+        payload: payload(delayed_job),
         priority: delayed_job.priority,
         attempts: delayed_job.attempts,
         queue: delayed_job.queue || "global",
@@ -23,49 +24,37 @@ module DjMon
       }
     end
 
-    class << self
-
-      def all
-        Delayed::Job.all
-      end
-
-      def failed
-        Delayed::Job.where('delayed_jobs.failed_at IS NOT NULL')
-      end
-
-      def active
-        Delayed::Job.where('delayed_jobs.failed_at IS NULL AND delayed_jobs.locked_by IS NOT NULL')
-      end
-
-      def queued
-        Delayed::Job.where('delayed_jobs.failed_at IS NULL AND delayed_jobs.locked_by IS NULL')
-      end
+    def payload job
+      job.payload_object.respond_to?(:object) ? job.payload_object.object.to_yaml : job.payload_object.to_yaml
+    end
 
+    class << self
       def reports_for jobs
         jobs.collect { |job| DjReport.new(job) }
       end
 
       def all_reports
-        reports_for all
+        reports_for DjMon::Backend.all
       end
 
       def failed_reports
-        reports_for failed
+        reports_for DjMon::Backend.failed
       end
 
       def active_reports
-        reports_for active
+        reports_for DjMon::Backend.active
       end
 
       def queued_reports
-        reports_for queued
+        reports_for DjMon::Backend.queued
       end
 
       def dj_counts
         {
-          failed: failed.size,
-          active: active.size,
-          queued: queued.size
+          all: DjMon::Backend.all.size,
+          failed: DjMon::Backend.failed.size,
+          active: DjMon::Backend.active.size,
+          queued: DjMon::Backend.queued.size
         }
       end
 
@@ -76,14 +65,16 @@ module DjMon
           max_attempts:        Delayed::Worker.max_attempts,
           max_run_time:        Delayed::Worker.max_run_time,
           read_ahead:          Delayed::Worker.read_ahead,
-          delay_jobs:          Delayed::Worker.delay_jobs
+          delay_jobs:          Delayed::Worker.delay_jobs,
+          delayed_job_version: Gem.loaded_specs["delayed_job"].version.version,
+          dj_mon_version:      DjMon::VERSION
         }
       end
     end
 
     private
-    def l_datetime date
-      date.present? ? I18n.l(date) : ""
+    def l_datetime time
+      time.present? ? time.strftime(TIME_FORMAT) : ""
     end
   end
 

data/app/views/dj_mon/dj_reports/index.html.haml

@@ -58,10 +58,10 @@
           {{#failed}}
           {{failed_at}}
           
-          = form_tag '/dj_mon/dj_reports/{{id}}/retry', method: :post, class: 'form-inline' do
+          = form_tag CGI.unescape(retry_dj_report_url(:id => "{{id}}")), method: :post, class: 'form-inline' do
             = submit_tag 'Retry', class: 'btn btn-info btn-mini'
 
-          = form_tag '/dj_mon/dj_reports/{{id}}', method: :delete, class: 'form-inline' do
+          = form_tag CGI.unescape(dj_report_url(:id => "{{id}}")), method: :delete, class: 'form-inline' do
             = submit_tag 'Delete', class: 'btn btn-danger btn-mini'
 
           {{/failed}}

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

@@ -16,8 +16,8 @@
 
             .pull-right
               #dj-counts-view
-    
-    .container
+
+    .container.centered
       - if flash[:notice]
         .alert.alert-success
           = flash[:notice]
@@ -26,15 +26,19 @@
       = yield
 
     = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
-    = javascript_include_tag "dj_mon.js"
+    = javascript_include_tag "dj_mon"
+    %script
+      var dj_counts_dj_reports_url = "#{dj_counts_dj_reports_url}"
 
     %script#dj_counts_template{ :type=> "text/x-handlebars-template" }
-      %span.badge
+      %span.badge.badge-warning
+        {{failed}} failed
+      %span.badge.badge-info
         {{queued}} queued
       %span.badge.badge-info
         {{active}} active
-      %span.badge.badge-warning
-        {{failed}} failed
+      %span.badge.badge-info
+        {{all}} all
 
     %script#dj_settings_template{ :type=> "text/x-handlebars-template" }
       .modal.hide
@@ -42,37 +46,47 @@
           %button{ type: "button", class: "close", 'data-dismiss' => "modal" }
             ×
           %h3
-            Delayed Job Settings
+            Settings
         .modal-body
           %table.table.table-bordered.table-striped
             %tr
               %td
-                Destroy failed jobs:
+                Delayed Job version
+              %td
+                <code>{{content.delayed_job_version}}</code>
+            %tr
+              %td
+                DJ Mon version
+              %td
+                <code>{{content.dj_mon_version}}</code>
+            %tr
+              %td
+                Destroy failed jobs
               %td
                 <code>{{content.destroy_failed_jobs}}</code>
             %tr
               %td
-                Sleep delay: 
+                Sleep delay
               %td
                 <code>{{content.sleep_delay}}</code> seconds
             %tr
               %td
-                Max attempts:
+                Max attempts
               %td
                 <code>{{content.max_attempts}}</code>
             %tr
               %td
-                Max run time:
+                Max run time
               %td
                 <code>{{content.max_run_time}}</code> seconds
             %tr
               %td
-                Read ahead:
+                Read ahead
               %td
                 <code>{{content.read_ahead}}</code>
             %tr
               %td
-                Delay Jobs:
+                Delay Jobs
               %td
                 <code>{{content.delay_jobs}}</code>
 

data/config/routes.rb

@@ -1,5 +1,5 @@
 DjMon::Engine.routes.draw do
-  
+
   resources :dj_reports do
     collection do
       get :all

data/lib/dj_mon/backend/activerecord.rb

@@ -0,0 +1,33 @@
+module DjMon
+  module Backend
+    module ActiveRecord
+      class << self
+        def all
+          Delayed::Job.all
+        end
+
+        def failed
+          Delayed::Job.where('delayed_jobs.failed_at IS NOT NULL')
+        end
+
+        def active
+          Delayed::Job.where('delayed_jobs.failed_at IS NULL AND delayed_jobs.locked_by IS NOT NULL')
+        end
+
+        def queued
+          Delayed::Job.where('delayed_jobs.failed_at IS NULL AND delayed_jobs.locked_by IS NULL')
+        end
+
+        def destroy id
+          dj = Delayed::Job.find(id)
+          dj.destroy if dj
+        end
+
+        def retry id
+          dj = Delayed::Job.find(id)
+          dj.update_attributes({ failed_at: nil }) if dj
+        end
+      end
+    end
+  end
+end

data/lib/dj_mon/backend/mongoid.rb

@@ -0,0 +1,33 @@
+module DjMon
+  module Backend
+    module Mongoid
+      class << self
+        def all
+          Delayed::Job.all
+        end
+
+        def failed
+          Delayed::Job.where(:failed_at.ne => nil)
+        end
+
+        def active
+          Delayed::Job.where(:failed_at => nil, :locked_by.ne => nil)
+        end
+
+        def queued
+          Delayed::Job.where(:failed_at => nil, :locked_by => nil)
+        end
+
+        def destroy id
+          dj = Delayed::Job.find(id)
+          dj.destroy if dj
+        end
+
+        def retry id
+          dj = Delayed::Job.find(id)
+          dj.update_attribute :failed_at, nil if dj
+        end
+      end
+    end
+  end
+end

data/lib/dj_mon/backend.rb

@@ -0,0 +1,21 @@
+module DjMon
+  module Backend
+    BACKEND_METHODS = [:all, :failed, :active, :queued, :destroy, :retry]
+
+    class << self
+      def used_backend
+        # it's hacky but, based on Delayed::Worker.backend= behavior
+        @@used_backend ||= begin
+          delayed_job_backend = Delayed::Worker.backend
+          backend_name = delayed_job_backend.to_s.split("::")[-2]
+          require "dj_mon/backend/#{backend_name.downcase}"
+          "DjMon::Backend::#{backend_name}".constantize
+        rescue
+          raise "DjMon has no backend for '#{delayed_job_backend}'"
+        end
+      end
+
+      delegate *BACKEND_METHODS, :to => :used_backend
+    end
+  end
+end

data/lib/dj_mon/version.rb

@@ -0,0 +1,3 @@
+module DjMon
+  VERSION = "0.1.3".freeze
+end

data/lib/dj_mon.rb

@@ -1,5 +1,6 @@
 require 'haml'
 require 'dj_mon/engine'
+require 'dj_mon/backend'
 
 module DjMon
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dj_mon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,70 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job_mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails engine based frontend for Delayed Job
 email:
 - projects@akshay.cc
@@ -62,14 +126,18 @@ files:
 - app/models/dj_mon/dj_report.rb
 - app/views/dj_mon/dj_reports/index.html.haml
 - app/views/layouts/dj_mon.html.haml
+- lib/dj_mon/backend/activerecord.rb
+- lib/dj_mon/backend/mongoid.rb
+- lib/dj_mon/backend.rb
 - lib/dj_mon/engine.rb
+- lib/dj_mon/version.rb
 - lib/dj_mon.rb
 - config/routes.rb
 - MIT-LICENSE
 - Rakefile
 - Gemfile
 - README.md
-homepage: http://portfolio.akshay.cc/dj_mon/
+homepage: https://github.com/akshayrawat/dj_mon
 licenses: []
 post_install_message: 
 rdoc_options: []