resque 1.24.0 → 1.24.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 38e90902e4b978a24840fc539e704cb215f5dd2a
+  data.tar.gz: 26a7b965a985bc1081301509ec15d2ef73212638
+SHA512:
+  metadata.gz: 22860bfff69fb573382a48b1a77d5bf7b8f180f4d3ac03096e5a70272cc467c9d9c5f4b764ebf5d22b91c38933f63d1afd2cf98fd3cdf029b7d30c43e97130eb
+  data.tar.gz: abf28fbbc53bd5f02ee78aa954b87b8c00f32f3c75bdd7e79d977120071975125630038274ea166f2ab0304de94caa8d454f68c3d294a5d932a44c9e59021bc9

data/HISTORY.md

@@ -1,6 +1,9 @@
-## unreleased
+## 1.24.1 (2013-3-23)
 
-* No changes.
+* Adds a default value for `per_page` on resque-server for plugins which add tabs (@jonhyman)
+* Fix bad logic on the failed queue adapter
+* Added missing `require 'time'` which was causing occasional errors which
+  would crash workers.
 
 ## 1.24.0 (2013-3-21)
 

data/lib/resque/failure/redis.rb

@@ -18,7 +18,7 @@ module Resque
       end
 
       def self.count(queue = nil, class_name = nil)
-        raise ArgumentError, "invalid queue: #{queue}" if queue && queue.to_s != "failed"
+        check_queue(queue)
 
         if class_name
           n = 0
@@ -34,7 +34,7 @@ module Resque
       end
 
       def self.all(offset = 0, limit = 1, queue = nil)
-        raise ArgumentError, "invalid queue: #{queue}" if queue && queue.to_s == "failed"
+        check_queue(queue)
         Resque.list_range(:failed, offset, limit)
       end
 
@@ -47,7 +47,7 @@ module Resque
       end
 
       def self.clear(queue = nil)
-        raise ArgumentError, "invalid queue: #{queue}" if queue && queue.to_s == "failed"
+        check_queue(queue)
         Resque.redis.del(:failed)
       end
 
@@ -84,6 +84,10 @@ module Resque
         end
       end
 
+      def self.check_queue(queue)
+        raise ArgumentError, "invalid queue: #{queue}" if queue && queue.to_s != "failed"
+      end
+
       def filter_backtrace(backtrace)
         index = backtrace.index { |item| item.include?('/lib/resque/job.rb') }
         backtrace.first(index.to_i)

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

@@ -1,3 +1,6 @@
+<% # per_page was added in 1.23.1; gems which add to resque-server don't pass that variable along so it would crash %>
+<% # without a default value %>
+<% per_page ||= 20 %>
 <%if  start - per_page >= 0 || start + per_page <= size%>
 <p class='pagination'>
   <% if start - per_page >= 0 %>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.24.0'
+  Version = VERSION = '1.24.1'
 end

data/lib/resque/worker.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Resque
   # A Resque Worker processes jobs. On platforms that support fork(2),
   # the worker will fork off a child to process each job. This ensures
@@ -223,7 +225,7 @@ module Resque
       log e.backtrace.join("\n")
       raise e
     end
-    
+
     # Reconnect to Redis to avoid sharing a connection with the parent,
     # retry up to 3 times with increasing delay before giving up.
     def reconnect
@@ -534,7 +536,7 @@ module Resque
     def idle?
       state == :idle
     end
-    
+
     def will_fork?
       !@cant_fork && !$TESTING && (ENV["FORK_PER_JOB"] != 'false')
     end
@@ -627,7 +629,7 @@ module Resque
     def log!(message)
       debug(message)
     end
-    
+
     # Deprecated legacy methods for controlling the logging threshhold
     # Use Resque.logger.level now, e.g.:
     #

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'redis/namespace'
-require 'mocha/setup'
 
 $dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift $dir + '/../lib'

metadata

@@ -1,112 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque
-version: !ruby/object:Gem::Version 
-  hash: 119
-  prerelease: 
-  segments: 
-  - 1
-  - 24
-  - 0
-  version: 1.24.0
+version: !ruby/object:Gem::Version
+  version: 1.24.1
 platform: ruby
-authors: 
+authors:
 - Chris Wanstrath
 - Terence Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-21 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis-namespace
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: vegas
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: vegas
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mono_logger
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mono_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id005
-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    Background jobs can be any Ruby class or module that responds to\n    perform. Your existing classes can easily be converted to background\n    jobs or you can create new classes specifically to do work. Or, you\n    can do both.\n\n    Resque is heavily inspired by DelayedJob (which rocks) and is\n    comprised of three parts:\n\n    * A Ruby library for creating, querying, and processing jobs\n    * A Rake task for starting a worker which processes jobs\n    * A Sinatra app for monitoring queues, jobs, and workers.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: |2
+      Resque is a Redis-backed Ruby library for creating background jobs,
+      placing those jobs on multiple queues, and processing them later.
+
+      Background jobs can be any Ruby class or module that responds to
+      perform. Your existing classes can easily be converted to background
+      jobs or you can create new classes specifically to do work. Or, you
+      can do both.
+
+      Resque is heavily inspired by DelayedJob (which rocks) and is
+      comprised of three parts:
+
+      * A Ruby library for creating, querying, and processing jobs
+      * A Rake task for starting a worker which processes jobs
+      * A Sinatra app for monitoring queues, jobs, and workers.
 email: chris@ozmm.org
-executables: 
+executables:
 - resque
 - resque-web
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - README.markdown
 - Rakefile
 - LICENSE
@@ -179,39 +177,29 @@ files:
 - test/resque_test.rb
 - test/test_helper.rb
 - test/worker_test.rb
-has_rdoc: true
 homepage: http://github.com/defunkt/resque
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Resque is a Redis-backed queueing system.
 test_files: []
-
+has_rdoc: