resque 1.5.0 → 1.5.1

data/CONTRIBUTORS

@@ -1,14 +1,23 @@
 * Chris Wanstrath
 * John Barnette
+* Aaron Quint
 * Adam Cooke
+* Mike Mangino
 * Rob Hanlon
 * Jason Amster
 * jgeiger
-* Aaron Quint
+* Daniel Ceballos
+* Matt Duncan
+* Roman Heinrich
 * Ben VandenBos
-* PJ Hyett
+* Christos Trochalakis
+* Matt Palmer
+* Michael Dwan
+* Brian P O'Rourke
+* Karel Minarik
 * Arthur Zapparoli
 * Simon Rozet
-* Brian P O'Rourke
 * Dave Hoover
-* Michael Dwan
+* PJ Hyett
+* Masatomo Nakano
+* gravis

data/HISTORY.md

@@ -1,3 +1,16 @@
+## 1.5.1 (2010-03-03)
+
+* `Job.destroy` and `Resque.dequeue` return the # of destroyed jobs.
+* Hoptoad notifier improvements
+* Specify the namespace with `resque-web` by passing `-N namespace`
+* Bugfix: Don't crash when trying to parse invalid JSON.
+* Bugfix: Non-standard namespace support
+* Web: Red backgound for queue "failed" only shown if there are failed jobs.
+* Web bugfix: Tabs highlight properly now
+* Web bugfix: ZSET partial support in stats
+* Web bugfix: Deleting failed jobs works again
+* Web bugfix: Sets (or zsets, lists, etc) now paginate.
+
 ## 1.5.0 (2010-02-17)
 
 * Version now included in procline, e.g. `resque-1.5.0: Message`

data/README.markdown

@@ -410,6 +410,10 @@ the script as the final argument:
 
     $ resque-web -p 8282 rails_root/config/initializers/resque.rb
 
+You can also set the namespace directly using `resque-web`:
+
+    $ resque-web -p 8282 -N myapp
+
 ### Passenger
 
 Using Passenger? Resque ships with a `config.ru` you can use. See

data/bin/resque-web

@@ -15,4 +15,9 @@ Vegas::Runner.new(Resque::Server, 'resque-web', {
     path = (ENV['RESQUECONFIG'] || v.args.first)
     load path.to_s.strip if path
   }
-})
+}) do |runner, opts, app|
+  opts.on('-N NAMESPACE', "--namespace NAMESPACE", "set the Redis namespace") {|namespace|
+    runner.logger.info "Using Redis namespace '#{namespace}'"
+    Resque.redis.namespace = namespace
+  }
+end

data/lib/resque.rb

@@ -156,6 +156,8 @@ module Resque
   # the provided class. See `Resque::Job.destroy` for more
   # information.
   #
+  # Returns the number of jobs destroyed.
+  #
   # Example:
   #
   #   # Removes all jobs of class `UpdateNetworkGraph`
@@ -228,7 +230,7 @@ module Resque
   # is O(N) for the keyspace, so be careful - this can be slow for big databases.
   def keys
     redis.keys("*").map do |key|
-      key.sub('resque:', '')
+      key.sub("#{redis.namespace}:", '')
     end
   end
 end

data/lib/resque/failure/hoptoad.rb

@@ -1,5 +1,6 @@
-require 'net/http'
+require 'net/https'
 require 'builder'
+require 'uri'
 
 module Resque
   module Failure
@@ -10,18 +11,17 @@ module Resque
     #   Resque::Failure::Hoptoad.configure do |config|
     #     config.api_key = 'blah'
     #     config.secure = true
-    #     config.subdomain = 'your_hoptoad_subdomain'
+    #
+    #     # optional proxy support
+    #     config.proxy_host = 'x.y.z.t'
+    #     config.proxy_port = 8080
     #   end
     class Hoptoad < Base
-      #from the hoptoad plugin
-      INPUT_FORMAT = %r{^([^:]+):(\d+)(?::in `([^']+)')?$}.freeze
-      
-      class << self
-        attr_accessor :secure, :api_key, :subdomain
-      end
+      # From the hoptoad plugin
+      INPUT_FORMAT = /^([^:]+):(\d+)(?::in `([^']+)')?$/
 
-      def self.url
-        "http://#{subdomain}.hoptoadapp.com/" if subdomain
+      class << self
+        attr_accessor :secure, :api_key, :proxy_host, :proxy_port
       end
 
       def self.count
@@ -35,13 +35,12 @@ module Resque
         Resque::Failure.backend = self
       end
 
-      
-
       def save
         http = use_ssl? ? :https : :http
         url = URI.parse("#{http}://hoptoadapp.com/notifier_api/v2/notices")
 
-        http = Net::HTTP.new(url.host, url.port)
+        request = Net::HTTP::Proxy(self.class.proxy_host, self.class.proxy_port)
+        http = request.new(url.host, url.port)
         headers = {
           'Content-type' => 'text/xml',
           'Accept' => 'text/xml, application/xml'
@@ -49,7 +48,7 @@ module Resque
 
         http.read_timeout = 5 # seconds
         http.open_timeout = 2 # seconds
-        
+
         http.use_ssl = use_ssl?
 
         begin
@@ -66,7 +65,7 @@ module Resque
           log "Hoptoad Failure: #{response.class}\n#{body}"
         end
       end
-      
+
       def xml
         x = Builder::XmlMarkup.new
         x.instruct!
@@ -99,10 +98,10 @@ module Resque
           x.tag!("server-environment") do
             x.tag!("environment-name",RAILS_ENV)
           end
-          
+
         end
       end
-      
+
       def fill_in_backtrace_lines(x)
         exception.backtrace.each do |unparsed_line|
           _, file, number, method = unparsed_line.match(INPUT_FORMAT).to_a

data/lib/resque/failure/redis.rb

@@ -25,7 +25,7 @@ module Resque
       end
       
       def self.clear
-        Resque.redis.delete('resque:failed')
+        Resque.redis.del(:failed)
       end
       
     end

data/lib/resque/helpers.rb

@@ -23,7 +23,11 @@ module Resque
       if defined? Yajl
         Yajl::Parser.parse(object, :check_utf8 => false)
       else
-        JSON.parse(object)
+        begin
+          JSON.parse(object)
+        rescue JSON::ParserError
+          logger.error "#{$!}"
+        end
       end
     end
 

data/lib/resque/job.rb

@@ -50,6 +50,8 @@ module Resque
     # Removes a job from a queue. Expects a string queue name, a
     # string class name, and, optionally, args.
     #
+    # Returns the number of jobs destroyed.
+    #
     # If no args are provided, it will remove all jobs of the class
     # provided.
     #
@@ -72,6 +74,7 @@ module Resque
     def self.destroy(queue, klass, *args)
       klass = klass.to_s
       queue = "queue:#{queue}"
+      destroyed = 0
 
       redis.lrange(queue, 0, -1).each do |string|
         json   = decode(string)
@@ -80,9 +83,11 @@ module Resque
         match &= json['args'] == args unless args.empty?
 
         if match
-          redis.lrem(queue, 0, string)
+          destroyed += redis.lrem(queue, 0, string).to_i
         end
       end
+
+      destroyed
     end
 
     # Given a string queue name, returns an instance of Resque::Job

data/lib/resque/server.rb

@@ -32,13 +32,14 @@ module Resque
         request.env['SCRIPT_NAME']
       end
 
-      def class_if_current(page = '')
-        'class="current"' if current_page.include? page.to_s
+      def class_if_current(path = '')
+        'class="current"' if current_page.start_with?(path.to_s)
       end
 
       def tab(name)
         dname = name.to_s.downcase
-        "<li #{class_if_current(dname)}><a href='#{url dname}'>#{name}</a></li>"
+        path = url(dname)
+        "<li #{class_if_current(path)}><a href='#{path}'>#{name}</a></li>"
       end
 
       def tabs
@@ -55,19 +56,23 @@ module Resque
           Resque.redis.scard(key)
         when 'string'
           Resque.redis.get(key).length
+        when 'zset'
+          Resque.redis.zcard(key)
         end
       end
 
-      def redis_get_value_as_array(key)
+      def redis_get_value_as_array(key, start=0)
         case Resque.redis.type(key)
         when 'none'
           []
         when 'list'
-          Resque.redis.lrange(key, 0, 20)
+          Resque.redis.lrange(key, start, start + 20)
         when 'set'
-          Resque.redis.smembers(key)
+          Resque.redis.smembers(key)[start..(start + 20)]
         when 'string'
           [Resque.redis.get(key)]
+        when 'zset'
+          Resque.redis.zrange(key, start, start + 20)
         end
       end
 
@@ -85,7 +90,7 @@ module Resque
       ensure
         @partial = false
       end
-      
+
       def poll
         if @polling
           text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
@@ -94,7 +99,7 @@ module Resque
         end
         "<p class='poll'>#{text}</p>"
       end
-      
+
     end
 
     def show(page, layout = true)
@@ -119,7 +124,7 @@ module Resque
         show page
       end
     end
-    
+
     %w( overview workers ).each do |page|
       get "/#{page}.poll" do
         content_type "text/plain"
@@ -135,7 +140,7 @@ module Resque
         show :failed
       end
     end
-    
+
     post "/failed/clear" do
       Resque::Failure.clear
       redirect u('failed')

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

@@ -31,8 +31,9 @@ body { padding:0; margin:0; }
 
 #main table.queues { width:40%;}
 #main table.queues td.queue { font-weight:bold; width:50%;}
-#main table.queues tr.failed td { background:#ffecec; border-top:2px solid #d37474; font-size:90%; color:#d37474;}
-#main table.queues tr.failed td a{  color:#d37474;}
+#main table.queues tr.failed td { border-top:2px solid; font-size:90%; }
+#main table.queues tr.failure td { background:#ffecec; border-top:2px solid #d37474; font-size:90%; color:#d37474;}
+#main table.queues tr.failure td a{ color:#d37474;}
 
 #main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:50%;}
 #main table.jobs td.args{ width:50%;}

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

@@ -0,0 +1,20 @@
+<% if key = params[:key] %>
+
+  <p class='sub'>
+    Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = redis_get_size(key) %></b>
+  </p>
+
+    
+  <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
+  <table>
+    <% for row in redis_get_value_as_array(key, start) %>
+    <tr>
+      <td>
+        <%= row %>
+      </td>
+    </tr>
+    <% end %>
+  </table>
+
+<%= partial :next_more, :start => start, :size => size %>
+<% end %>

data/lib/resque/server/views/{key.erb → key_string.erb}

@@ -1,17 +1,11 @@
 <% if key = params[:key] %>
-
   <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
   <h2>size: <%= redis_get_size(key) %></h2>
   <table>
-    <% for row in redis_get_value_as_array(key) %>
     <tr>
       <td>
-        <%= row %>
+        <%= redis_get_value_as_array(key) %>
       </td>
     </tr>
-    <% end %>
   </table>
-
-<% else %>
-
-<% end %>
+<% end %>

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

@@ -37,10 +37,10 @@
       <td class='size'><%= resque.size queue %></td>
     </tr>
     <% end %>
-    <tr class='failed'>
+    <tr class="<%= Resque::Failure.count.zero? ? "failed" : "failure" %>">
       <td class='queue failed'><a class="queue" href="<%= url :failed %>">failed</a></td>
       <td class='size'><%= Resque::Failure.count %></td>
     </tr>
   </table>
 
-<% end %>
+<% end %>

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

@@ -2,7 +2,7 @@
 
 <% if params[:key] %>
 
-<%= partial :key %>
+<%= partial resque.redis.type(params[:key]).eql?("string") ? :key_string : :key_sets %>
 
 <% elsif params[:id] == "resque" %>
 
@@ -59,4 +59,4 @@
 
 <% else %>
 
-<% end %>
+<% end %>

data/lib/resque/tasks.rb

@@ -24,7 +24,7 @@ namespace :resque do
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end
 
-  desc "Start multiple Resque workers"
+  desc "Start multiple Resque workers. Should only be used in dev mode."
   task :workers do
     threads = []
 

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.5.0'
+  Version = '1.5.1'
 end

data/test/resque_test.rb

@@ -79,9 +79,9 @@ context "Resque" do
     assert Resque::Job.create(:jobs, 'BadJob', 20, '/tmp')
 
     assert_equal 5, Resque.size(:jobs)
-    Resque::Job.destroy(:jobs, 'SomeJob')
+    assert_equal 2, Resque::Job.destroy(:jobs, 'SomeJob')
     assert_equal 3, Resque.size(:jobs)
-    Resque::Job.destroy(:jobs, 'BadJob', 30, '/tmp')
+    assert_equal 1, Resque::Job.destroy(:jobs, 'BadJob', 30, '/tmp')
     assert_equal 2, Resque.size(:jobs)
   end
 
@@ -217,4 +217,8 @@ context "Resque" do
     assert_equal 1, stats[:failed]
     assert_equal ['localhost:9736'], stats[:servers]
   end
+  
+  test "decode bad json" do
+    assert_nil Resque.decode("{\"error\":\"Module not found \\u002\"}")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -08:00
+date: 2010-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,8 @@ files:
 - lib/resque/server/public/working.png
 - lib/resque/server/views/error.erb
 - lib/resque/server/views/failed.erb
-- lib/resque/server/views/key.erb
+- lib/resque/server/views/key_sets.erb
+- lib/resque/server/views/key_string.erb
 - lib/resque/server/views/layout.erb
 - lib/resque/server/views/next_more.erb
 - lib/resque/server/views/overview.erb