mongo-resque 1.18.2 → 1.19.0

data/HISTORY.md

@@ -1,3 +1,26 @@
+## 1.19.0 (2011-09-06)
+
+* Changed Hoptoad failure backend into Airbrake (not backwards compatible!)
+* Web UI: Added retry all button to failed jobs page
+* Web UI: Show focus outline
+
+## 1.18.6 (2011-08-30)
+
+* Bugfix: Use Rails 3 eager loading for resque:preload
+
+## 1.18.5 (2011-08-24)
+
+* Added support for Travis CI
+* Bugfix: preload only happens in production Rails environment
+
+## 1.18.4 (2011-08-23)
+
+* Bugfix: preload task depends on setup
+
+## 1.18.3 (2011-08-23)
+
+* Bugfix: Fix preloading on Rails 3.x.
+
 ## 1.18.2 (2011-08-19)
 
 * Fix RAILS_ROOT deprecation warning

data/README.markdown

@@ -23,8 +23,9 @@ to use the same database for your application as Resque (this might
 still not be the best idea though - behold the stern warnings below).
 
 Original resque is currently using hoptoad_notifier in its Hoptoad Failure
-Backend. This fork has not implemented this change as I'm undecided wether 
-the change was for the better or not (we avoid dependency troubles this way).
+Backend and the airbrake gem for its Airbrake Faiure Backend. This fork has
+chosen not to add these dependencies but rather have its own clean support
+for Airbrake (the Hoptoad backend has been deprecated).
 
 Delayed Jobs
 ------------

data/lib/resque/failure.rb

@@ -22,8 +22,8 @@ module Resque
     # `Resque::Failure::Base`.
     #
     # Example use:
-    #   require 'resque/failure/hoptoad'
-    #   Resque::Failure.backend = Resque::Failure::Hoptoad
+    #   require 'resque/failure/airbrake'
+    #   Resque::Failure.backend = Resque::Failure::Airbrake
     def self.backend=(backend)
       @backend = backend
     end

data/lib/resque/failure/{hoptoad.rb → airbrake.rb}

@@ -4,13 +4,13 @@ require 'uri'
 
 module Resque
   module Failure
-    # A Failure backend that sends exceptions raised by jobs to Hoptoad.
+    # A Failure backend that sends exceptions raised by jobs to Airbrake.
     #
     # To use it, put this code in an initializer, Rake task, or wherever:
     #
-    #   require 'resque/failure/hoptoad'
+    #   require 'resque/failure/airbrake'
     #
-    #   Resque::Failure::Hoptoad.configure do |config|
+    #   Resque::Failure::Airbrake.configure do |config|
     #     config.api_key = 'blah'
     #     config.secure = true
     #
@@ -21,8 +21,8 @@ module Resque
     #     # server env support, defaults to RAILS_ENV or RACK_ENV
     #     config.server_environment = "test"
     #   end
-    class Hoptoad < Base
-      # From the hoptoad plugin
+    class Airbrake < Base
+      # From the airbrake plugin
       INPUT_FORMAT = /^([^:]+):(\d+)(?::in `([^']+)')?$/
 
       class << self
@@ -31,7 +31,7 @@ module Resque
       end
 
       def self.count
-        # We can't get the total # of errors from Hoptoad so we fake it
+        # We can't get the total # of errors from Airbrake so we fake it
         # by asking Resque how many errors it has seen.
         Stat[:failed]
       end
@@ -43,7 +43,7 @@ module Resque
 
       def save
         http = use_ssl? ? :https : :http
-        url = URI.parse("#{http}://hoptoadapp.com/notifier_api/v2/notices")
+        url = URI.parse("#{http}://airbrakeapp.com/notifier_api/v2/notices")
 
         request = Net::HTTP::Proxy(self.class.proxy_host, self.class.proxy_port)
         http = request.new(url.host, url.port)
@@ -60,15 +60,15 @@ module Resque
         begin
           response = http.post(url.path, xml, headers)
         rescue TimeoutError => e
-          log "Timeout while contacting the Hoptoad server."
+          log "Timeout while contacting the Airbrake server."
         end
 
         case response
         when Net::HTTPSuccess then
-          log "Hoptoad Success: #{response.class}"
+          log "Airbrake Success: #{response.class}"
         else
           body = response.body if response.respond_to? :body
-          log "Hoptoad Failure: #{response.class}\n#{body}"
+          log "Airbrake Failure: #{response.class}\n#{body}"
         end
       end
 
@@ -78,7 +78,7 @@ module Resque
         x.notice :version=>"2.0" do
           x.tag! "api-key", api_key
           x.notifier do
-            x.name "Resqueue"
+            x.name "Resque"
             x.version "0.1"
             x.url "http://github.com/defunkt/resque"
           end

data/lib/resque/server.rb

@@ -214,6 +214,13 @@ module Resque
       redirect u('failed')
     end
 
+    post "/failed/requeue/all" do
+      Resque::Failure.count.times do |num|
+        Resque::Failure.requeue(num)
+      end
+      redirect u('failed')
+    end
+
     get "/failed/requeue/:index" do
       Resque::Failure.requeue(params[:index])
       if request.xhr?

data/lib/resque/server/public/reset.css

@@ -16,10 +16,6 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	font-family: inherit;
 }
 
-:focus {
-	outline: 0;
-}
-
 body {
 	line-height: 1;
 }

data/lib/resque/server/public/style.css

@@ -87,6 +87,6 @@ body { padding:0; margin:0; }
 #main p.pagination a.less { float:left;}
 #main p.pagination a.more { float:right;}
 
-#main form {float:right; margin-top:-10px;}
+#main form {float:right; margin-top:-10px;margin-left:10px;}
 
 #main .time a.toggle_format {text-decoration:none;}

data/lib/resque/server/views/failed.erb

@@ -5,9 +5,12 @@
 
 <h1>Failed Jobs</h1>
 <%unless failed.empty?%>
-<form method="POST" action="<%=u 'failed/clear'%>" class='clear-failed'>
+<form method="POST" action="<%=u 'failed/clear'%>">
   <input type='submit' name='' value='Clear Failed Jobs' />
 </form>
+<form method="POST" action="<%=u 'failed/requeue/all'%>">
+  <input type='submit' name='' value='Retry Failed Jobs' />
+</form>
 <%end%>
 
 <p class='sub'>Showing <%=start%> to <%= start + 20 %> of <b><%= size = Resque::Failure.count %></b> jobs</p>

data/lib/resque/tasks.rb

@@ -41,11 +41,14 @@ namespace :resque do
   end
 
   # Preload app files if this is Rails
-  task :preload do
-    if defined? Rails
-      Dir["#{Rails.root}/app/**/*.rb"].each do |file|
-        require file
-      end
+  task :preload => :setup do
+    if defined?(Rails) && Rails.respond_to?(:application)
+      # Rails 3
+      Rails.application.eager_load!
+    elsif defined?(Rails::Initializer)
+      # Rails 2.3
+      $rails_rake_task = false
+      Rails::Initializer.run :load_application_classes
     end
   end
 end

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.18.2'
+  Version = VERSION = '1.19.0'
 end

data/lib/tasks/resque.rake

@@ -1,2 +1,2 @@
-$LOAD_PATH.unshift File.expand_path("../..", __FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
 require 'resque/tasks'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo-resque
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
+date: 2011-09-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2157276880 !ruby/object:Gem::Requirement
+  requirement: &2153563380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157276880
+  version_requirements: *2153563380
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2157276380 !ruby/object:Gem::Requirement
+  requirement: &2153562880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157276380
+  version_requirements: *2153562880
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157275680 !ruby/object:Gem::Requirement
+  requirement: &2153562420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157275680
+  version_requirements: *2153562420
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2157275100 !ruby/object:Gem::Requirement
+  requirement: &2153591640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157275100
+  version_requirements: *2153591640
 description: ! "    Resque is a Redis-backed Ruby library for creating background
   jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n
   \   Mongo-Resque is the same thing, but for mongo. It would not exist\n    without
@@ -71,8 +71,8 @@ extra_rdoc_files:
 files:
 - lib/resque/delayed.rb
 - lib/resque/errors.rb
+- lib/resque/failure/airbrake.rb
 - lib/resque/failure/base.rb
-- lib/resque/failure/hoptoad.rb
 - lib/resque/failure/mongo.rb
 - lib/resque/failure/multiple.rb
 - lib/resque/failure/redis.rb