dj_mon 1.0.3 → 1.1.0

data/README.md

@@ -25,13 +25,17 @@ Or install it yourself as:
 
 ## Note
 
-Supports `activerecord` and `mongoid`.
+* Supports `activerecord` and `mongoid`.
+* Supports `ruby 1.8.7` or higher for `activerecord`. `delayed_job_mongoid` depends
+  on `mongoid 3.0` which needs ruby 1.9, so there is no support for `ruby
+  1.8.7` for that.
+
 
 ## Usage
 
 If you are using Rails =< 3.1, or if `config.assets.initialize_on_precompile` is set to false, then add this to `config/environments/production.rb`.
 
-    config.assets.precompile += %w( dj_mon.js dj_mon.css)
+    config.assets.precompile += %w( dj_mon/dj_mon.js dj_mon/dj_mon.css)
 
 Mount it in `routes.rb`
 
@@ -65,4 +69,4 @@ root:
     rake test:prepare
     rake
 
-![Screenshot](https://github.com/akshayrawat/dj_mon_demo/raw/master/docs/screenshot.jpg)
+![Screenshot](https://github.com/akshayrawat/dj_mon_demo/raw/master/docs/screenshot.jpg)

data/Rakefile

@@ -19,14 +19,22 @@ namespace :test do
     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
+  if RUBY_VERSION =~ /^1\.9/
+
+    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 ]
+
+  else
+    # delayed_job_mongoid needs ~> mongoid 3.0 which needs ruby 1.9.
+    desc "Runs active_record tests"
+    task "all"=> [ :active_record ]
 
-  desc "Runs all tests"
-  task "all"=> [ :active_record, :mongoid ]
+  end
 
   desc "Prepare environment for tests"
   task :prepare do
@@ -37,7 +45,7 @@ namespace :test do
 
 end
 
-task default: 'test:all'
+task :default=> 'test:all'
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/app/controllers/dj_mon/dj_reports_controller.rb

@@ -36,7 +36,7 @@ module DjMon
     def retry
       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" }
+        format.html { redirect_to root_url, :notice => "The job has been queued for a re-run" }
         format.json { head(:ok) }
       end
     end
@@ -44,7 +44,7 @@ module DjMon
     def destroy
       DjMon::Backend.destroy params[:id]
       respond_to do |format|
-        format.html { redirect_to root_url, notice: "The job was deleted" }
+        format.html { redirect_to root_url, :notice => "The job was deleted" }
         format.json { head(:ok) }
       end
     end

data/app/models/dj_mon/dj_report.rb

@@ -10,17 +10,17 @@ module DjMon
 
     def as_json(options={})
       { 
-        id: delayed_job.id,
-        payload: payload(delayed_job),
-        priority: delayed_job.priority,
-        attempts: delayed_job.attempts,
-        queue: delayed_job.queue || "global",
-        last_error_summary: delayed_job.last_error.to_s.truncate(30),
-        last_error: delayed_job.last_error,
-        failed_at: l_datetime(delayed_job.failed_at),
-        run_at: l_datetime(delayed_job.run_at),
-        created_at: l_datetime(delayed_job.created_at),
-        failed: delayed_job.failed_at.present?
+        :id => delayed_job.id,
+        :payload => payload(delayed_job),
+        :priority => delayed_job.priority,
+        :attempts => delayed_job.attempts,
+        :queue => delayed_job.queue || "global",
+        :last_error_summary => delayed_job.last_error.to_s.truncate(30),
+        :last_error => delayed_job.last_error,
+        :failed_at => l_datetime(delayed_job.failed_at),
+        :run_at => l_datetime(delayed_job.run_at),
+        :created_at => l_datetime(delayed_job.created_at),
+        :failed => delayed_job.failed_at.present?
       }
     end
 
@@ -51,23 +51,23 @@ module DjMon
 
       def dj_counts
         {
-          all: DjMon::Backend.all.size,
-          failed: DjMon::Backend.failed.size,
-          active: DjMon::Backend.active.size,
-          queued: DjMon::Backend.queued.size
+          :all => DjMon::Backend.all.size,
+          :failed => DjMon::Backend.failed.size,
+          :active => DjMon::Backend.active.size,
+          :queued => DjMon::Backend.queued.size
         }
       end
 
       def settings
         {
-          destroy_failed_jobs: Delayed::Worker.destroy_failed_jobs,
-          sleep_delay:         Delayed::Worker.sleep_delay,
-          max_attempts:        Delayed::Worker.max_attempts,
-          max_run_time:        Delayed::Worker.max_run_time,
-          read_ahead:          defined?(Delayed::Worker.read_ahead) ? Delayed::Worker.read_ahead : 5,
-          delay_jobs:          Delayed::Worker.delay_jobs,
-          delayed_job_version: Gem.loaded_specs["delayed_job"].version.version,
-          dj_mon_version:      DjMon::VERSION
+          :destroy_failed_jobs => Delayed::Worker.destroy_failed_jobs,
+          :sleep_delay =>         Delayed::Worker.sleep_delay,
+          :max_attempts =>        Delayed::Worker.max_attempts,
+          :max_run_time =>        Delayed::Worker.max_run_time,
+          :read_ahead =>          defined?(Delayed::Worker.read_ahead) ? Delayed::Worker.read_ahead : 5,
+          :delay_jobs =>          Delayed::Worker.delay_jobs,
+          :delayed_job_version => Gem.loaded_specs["delayed_job"].version.version,
+          :dj_mon_version =>      DjMon::VERSION
         }
       end
     end

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

@@ -2,7 +2,7 @@
   .lead
     Delayed Jobs
   .pull-right
-    = link_to "Get DJ Mon for iPhone", "http://itunes.apple.com/app/dj-mon/id552732872", target: '_blank', class: 'btn btn-mini'
+    = link_to "Get DJ Mon for iPhone", "http://itunes.apple.com/app/dj-mon/id552732872", :target => '_blank', :class => 'btn btn-mini'
 
 %ul.nav.nav-tabs
   %li.active
@@ -63,11 +63,11 @@
           {{#failed}}
           {{failed_at}}
           
-          = 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 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 CGI.unescape(dj_report_url(:id => "{{id}}")), method: :delete, class: 'form-inline' do
-            = submit_tag 'Delete', class: 'btn btn-danger btn-mini'
+          = 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}}
 
@@ -76,7 +76,7 @@
 %script#last_error_template{ :type=> "text/x-handlebars-template" }
   .modal.hide
     .modal-header
-      %button{ type: "button", class: "close", 'data-dismiss' => "modal" }
+      %button{ :type => "button", :class => "close", 'data-dismiss' => "modal" }
         ×
       %h3
         Last Error
@@ -84,4 +84,4 @@
       %code
         {{content}}
     .modal-footer
-      = link_to "Close", '#', class: 'btn btn-primary', 'data-dismiss'=> 'modal'
+      = link_to "Close", '#', :class => 'btn btn-primary', 'data-dismiss'=> 'modal'

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

@@ -1,7 +1,10 @@
 !!! 5
 %html
   %head{:lang => "en"}
-    = stylesheet_link_tag "dj_mon", :media => "screen, projection"
+    %meta{:name => "apple-itunes-app", :content => "app-id=552732872"}
+    = stylesheet_link_tag "dj_mon/dj_mon", :media => "screen, projection"
+    = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
+    = javascript_include_tag "dj_mon/dj_mon"
     = yield :head
 
   %body
@@ -10,9 +13,9 @@
         .navbar-inner
           .container
             .pull-left
-              = link_to "DJ Mon", dj_reports_url, class: "brand"
+              = link_to "DJ Mon", dj_reports_url, :class => "brand"
             .pull-right
-              = link_to "Settings", "#dj_settings_template", rel: 'modal', 'data-content'=> "#{DjMon::DjReport.settings.to_json}", id: 'settings', class: 'btn btn-primary btn-mini'
+              = link_to "Settings", "#dj_settings_template", :rel => 'modal', 'data-content'=> "#{DjMon::DjReport.settings.to_json}", :id => 'settings', :class => 'btn btn-primary btn-mini'
 
             .pull-right
               #dj-counts-view
@@ -25,8 +28,6 @@
     .container
       = yield
 
-    = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
-    = javascript_include_tag "dj_mon"
     %script
       var dj_counts_dj_reports_url = "#{dj_counts_dj_reports_url}"
 
@@ -43,7 +44,7 @@
     %script#dj_settings_template{ :type=> "text/x-handlebars-template" }
       .modal.hide
         .modal-header
-          %button{ type: "button", class: "close", 'data-dismiss' => "modal" }
+          %button{ :type => "button", :class => "close", 'data-dismiss' => "modal" }
             ×
           %h3
             Settings
@@ -91,5 +92,5 @@
                 <code>{{content.delay_jobs}}</code>
 
         .modal-footer
-          = link_to "Close", '#', class: 'btn btn-primary', 'data-dismiss'=> 'modal'
+          = link_to "Close", '#', :class => 'btn btn-primary', 'data-dismiss'=> 'modal'
 

data/lib/dj_mon/backend.rb

@@ -14,8 +14,9 @@ module DjMon
           raise "DjMon has no backend for '#{delayed_job_backend}'"
         end
       end
-
-      delegate *BACKEND_METHODS, :to => :used_backend
+      
+      BACKEND_METHODS << {:to => :used_backend}
+      delegate *BACKEND_METHODS
     end
   end
 end

data/lib/dj_mon/backend/activerecord.rb

@@ -25,7 +25,7 @@ module DjMon
 
         def retry id
           dj = Delayed::Job.find(id)
-          dj.update_attributes({ failed_at: nil }) if dj
+          dj.update_attribute :failed_at, nil if dj
         end
       end
     end

data/lib/dj_mon/engine.rb

@@ -9,7 +9,7 @@ module DjMon
 
     if Rails.version > "3.1"
       initializer "DJMon precompile hook" do |app|
-        app.config.assets.precompile += ['dj_mon.js', 'dj_mon.css']
+        app.config.assets.precompile += ['dj_mon/dj_mon.js', 'dj_mon/dj_mon.css']
       end
     end
 

data/lib/dj_mon/version.rb

@@ -1,3 +1,3 @@
 module DjMon
-  VERSION = "1.0.3".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dj_mon
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/dj_mon.js
-- app/assets/stylesheets/dj_mon.css
+- app/assets/javascripts/dj_mon/dj_mon.js
+- app/assets/stylesheets/dj_mon/dj_mon.css
 - app/controllers/dj_mon/dj_reports_controller.rb
 - app/models/dj_mon/dj_report.rb
 - app/views/dj_mon/dj_reports/index.html.haml