resque 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6029ead32e829bcc359edabd6540a827fc8dff70768f26dbc6756041c98a6691
-  data.tar.gz: c6a568f692f54fd91cd8371b029babaf70c096ccb8b020cd3a76eb16f6e0ab56
+  metadata.gz: 357503e977394f513419b3146484eab796354a978d6d96e74e16fae0dc2fd3de
+  data.tar.gz: 4e3da6258793f0b094cba61c35436d30f1193d8d43553e312b8e5c14cbb7ee5b
 SHA512:
-  metadata.gz: bc4575c01a0ad8e803a7a21b707bdcfca8d7a4cbab3d19f80476fce6b28e900857c3a19271358805b16f99bf59e666ff3e7bfb61911ec4271014d4c41aa53322
-  data.tar.gz: 2af75588506a9e8d54dbe74d6a9f3c5ef96d1daccf3d76b4e2d820bbad388730fe69f829bc3077f06d609c50f131edf9c0b102271ebd70ec8e2143df9e0c4a12
+  metadata.gz: 00e3f45822df5638bb129c32c10878e2651cb74081711d4d4ef30da47403195c07276a4dbcb60e650c35dbc40ba0bcfb48d4a2c625eb442dec476e8a18929a7a
+  data.tar.gz: 942ff614b651c87ab52726aa88564243fd60b3c87edff7670fcb61491f2a45516a8c91eed44119d5945a322f0598f9be28d3ab5d610146e9d488e261514bf0af

data/HISTORY.md

@@ -1,3 +1,25 @@
+## 3.0.2
+
+### Added
+
+* resque-web: Support IPv6 hosts in the server URL (#1938)
+
+### Fixed
+
+* resque-web: Escape queue names, worker IDs, job classes, failed job details, Redis keys/values, and the reflected request path; serve `/stats.txt` as `text/plain` (#1946)
+* resque-web: Fix the class filter link URL on the failed jobs page (#1934)
+* Prefer `MultiJson.generate`/`parse` over the deprecated `dump`/`load` (#1944)
+* Add tests covering which hooks run in which process (#1932)
+
+## 3.0.1
+
+### Fixed
+
+* resque-web: Fix reflected XSS in the key sets endpoint (#1942)
+* Address multi_json class name deprecation warning (#1940)
+* Update the Rails initializer docs to load Redis config with `config_for` (#1936)
+* Add tests covering queue priority ordering with wildcards (#1930)
+
 ## 3.0.0
 
 ### Breaking Changes
@@ -5,6 +27,7 @@
 * **Minimum Ruby version is now 3.0.0** - Ruby 2.x is no longer supported
 * **Minimum Sinatra version is now 2.0** - old Sinatra versions (0.9-1.x) are no longer supported
 * **Rack 1.x is no longer supported** - Resque now requires Rack 2.x or greater
+* **Minimum Rails version is now 7.2** - You can use Resque without Rails, but if you use it with Rails it must be a version that is still supported
 
 ### Added
 

data/README.markdown

@@ -495,12 +495,14 @@ Here's our `config/resque.yml`:
 And our initializer:
 
 ``` ruby
-rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
-rails_env = ENV['RAILS_ENV'] || 'development'
-config_file = rails_root + '/config/resque.yml'
+config_file = 'config/resque.yml'
+rails_env = ENV['RAILS_ENV'] || Rails.env
 
-resque_config = YAML::load(ERB.new(IO.read(config_file)).result)
+resque_config = YAML::load_file(config_file)
 Resque.redis = resque_config[rails_env]
+
+# OR auto load with current env
+Resque.redis = Rails.application.config_for(:resque)
 ```
 
 Easy peasy! Why not just use `RAILS_ROOT` and `RAILS_ENV`? Because
@@ -632,7 +634,7 @@ Choose DelayedJob if:
 * You like numeric priorities
 * You're not doing a gigantic amount of jobs each day
 * Your queue stays small and nimble
-* There is not a lot failure / chaos
+* There is not a lot of failure / chaos
 * You want to easily throw anything on the queue
 * You don't want to setup Redis
 

data/lib/resque/helpers.rb

@@ -1,14 +1,19 @@
 require 'multi_json'
 
-# OkJson won't work because it doesn't serialize symbols
-# in the same way yajl and json do.
-if MultiJson.respond_to?(:adapter)
-  raise "Please install the yajl-ruby or json gem" if MultiJson.adapter.to_s == 'MultiJson::Adapters::OkJson'
-elsif MultiJson.respond_to?(:engine)
-  raise "Please install the yajl-ruby or json gem" if MultiJson.engine.to_s == 'MultiJson::Engines::OkJson'
-end
-
 module Resque
+  # multi_json renamed it's top-level constant from MultiJson to MultiJSON,
+  # keeping MultiJson as a deprecated alias until v2.0. Reference whichever name the
+  # installed version exposes so we stay compatible with future versions of multi_json
+  MultiJson = defined?(::MultiJSON) ? ::MultiJSON : ::MultiJson
+
+  # OkJson won't work because it doesn't serialize symbols
+  # in the same way yajl and json do.
+  if MultiJson.respond_to?(:adapter)
+    raise "Please install the yajl-ruby or json gem" if MultiJson.adapter.to_s.end_with?('::OkJson')
+  elsif MultiJson.respond_to?(:engine)
+    raise "Please install the yajl-ruby or json gem" if MultiJson.engine.to_s.end_with?('::OkJson')
+  end
+
   # Methods used by various classes in Resque.
   module Helpers
     class DecodeException < StandardError; end

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

@@ -5,7 +5,7 @@
 <% end %>
 
 <% unless failed_size.zero? %>
-<form method="POST" action="<%= u "failed#{'/' + params[:queue] if params[:queue]}/clear" %>">
+<form method="POST" action="<%= h u("failed#{'/' + params[:queue] if params[:queue]}/clear") %>">
   <input type="submit" name="" value="Clear <%= params[:queue] ? "'#{escape_html(params[:queue])}'" : 'Failed' %> Jobs" class="confirmSubmission" />
 </form>
 
@@ -14,7 +14,7 @@
     <input type="submit" name="" value="Clear Retried Jobs" onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
   </form>
 <% end %>
-<form method="POST" action="<%= u "failed#{'/' + params[:queue] if params[:queue]}/requeue/all" %>">
+<form method="POST" action="<%= h u("failed#{'/' + params[:queue] if params[:queue]}/requeue/all") %>">
   <input type="submit" name="" value="Retry <%= params[:queue] ? "'#{escape_html(params[:queue])}'" : 'Failed' %> Jobs" class="confirmSubmission" />
 </form>
 <% end %>

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

@@ -2,28 +2,28 @@
   <dl>
     <% if job.nil? %>
     <dt>Error</dt>
-    <dd>Job <%= id %> could not be parsed; perhaps it contains invalid JSON?</dd>
+    <dd>Job <%= h id %> could not be parsed; perhaps it contains invalid JSON?</dd>
     <% else %>
     <dt>Worker</dt>
     <dd>
-      <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= DateTime.parse(job['failed_at']).strftime(failed_date_format) %></span></b>
+      <a href="<%= h u(:workers, job['worker']) %>"><%= h job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= h job['queue'] %></b > at <b><span class="time"><%= DateTime.parse(job['failed_at']).strftime(failed_date_format) %></span></b>
       <% if job['retried_at'] %>
         <div class='retried'>
           Retried <b><span class="time"><%= DateTime.parse(job['retried_at']).strftime(failed_date_format) %></span></b>
-          <a href="<%= u "#{queue}/remove/#{id}" %>" class="remove" rel="remove">Remove</a>
+          <a href="<%= h u("#{queue}/remove/#{id}") %>" class="remove" rel="remove">Remove</a>
         </div>
       <% else %>
         <div class='controls'>
-          <a href="<%= u "#{queue}/requeue/#{id}" %>" rel="retry">Retry</a>
+          <a href="<%= h u("#{queue}/requeue/#{id}") %>" rel="retry">Retry</a>
           or
-          <a href="<%= u "#{queue}/remove/#{id}" %>" rel="remove">Remove</a>
+          <a href="<%= h u("#{queue}/remove/#{id}") %>" rel="remove">Remove</a>
         </div>
       <% end %>
     </dd>
     <dt>Class</dt>
     <dd>
       <% if job['payload'] && job['payload']['class'] %>
-        <a href="<%= u "failed/#{params[:queue]}?class=#{job['payload']['class']}" %>">
+        <a href="<%= h u("#{queue}?class=#{job['payload']['class']}") %>">
           <%= partial :job_class, :job => job['payload'] %>
         </a>
       <% else %>
@@ -33,7 +33,7 @@
     <dt>Arguments</dt>
     <dd><pre><%=h job['payload'] ? show_args(job['payload']['args']) : 'nil' %></pre></dd>
     <dt>Exception</dt>
-    <dd><code><%= job['exception'] %></code></dd>
+    <dd><code><%= h job['exception'] %></code></dd>
     <dt>Error</dt>
     <dd class='error'>
       <% if job['backtrace'] %>

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

@@ -7,14 +7,14 @@
 
   <% Resque::Failure.queues.sort.each do |queue| %>
 	  <tr>
-	    <th><b class="queue-tag"><a href="<%= u "/failed/#{queue}" %>"><%= queue %></a></b></th>
+	    <th><b class="queue-tag"><a href="<%= h u("/failed/#{queue}") %>"><%= h queue %></a></b></th>
 	    <th style="width:75px;" class="center"><%= Resque::Failure.count(queue) %></th>
 	  </tr>
 
     <% failed_class_counts(queue).sort_by { |name,_| name }.each do |k, v| %>
-    <tr id="<%= k %>">
+    <tr id="<%= h k %>">
       <td>
-        <a href="<%= u "/failed/#{queue}?class=#{k}" %>"><span class="failed failed_class"><%= k %></span></a>
+        <a href="<%= h u("/failed/#{queue}?class=#{k}") %>"><span class="failed failed_class"><%= h k %></span></a>
       </td>
       <td style="text-align: center;" class="failed<%= (v.to_i > 1000) ? '_many' : '' %>"><%= v %></td>
     </tr>

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

@@ -1,8 +1,8 @@
 <% if job['class'] == 'ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper' %>
-  <code><%= job['args'].first['job_class'] %></code>
+  <code><%= h job['args'].first['job_class'] %></code>
   <small>
     <a href="http://edgeguides.rubyonrails.org/active_job_basics.html" rel="noopener noreferrer" target="_blank">(via ActiveJob)</a>
   </small>
 <% else %>
-  <code><%= job['class'] %></code>
+  <code><%= h job['class'] %></code>
 <% end %>

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

@@ -2,12 +2,12 @@
 
   <p class='sub'><%= page_entries_info start = params[:start].to_i, start + 20, size = redis_get_size(key) %></p>
 
-  <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
+  <h1>Key "<%= escape_html(key) %>" is a <%= resque.redis.type key %></h1>
   <table>
     <% for row in redis_get_value_as_array(key, start) %>
     <tr>
       <td>
-        <%= row %>
+        <%= h row %>
       </td>
     </tr>
     <% end %>

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

@@ -4,7 +4,7 @@
   <table>
     <tr>
       <td>
-        <%= redis_get_value_as_array(key) %>
+        <%= h redis_get_value_as_array(key) %>
       </td>
     </tr>
   </table>

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

@@ -19,7 +19,7 @@
     </ul>
     <% if Resque.redis.namespace != :resque %>
       <abbr class="namespace" title="Resque's Redis Namespace">
-       <%= Resque.redis.namespace %>
+       <%= h Resque.redis.namespace %>
       </abbr>
     <% end %>
   </div>
@@ -27,7 +27,7 @@
   <% if defined?(@subtabs) && @subtabs %>
     <ul class='subnav'>
       <% for subtab in @subtabs %>
-        <li <%= class_if_current "#{current_section}/#{subtab}" %>><a href="<%= current_section %>/<%= subtab %>"><span><%= subtab %></span></a></li>
+        <li <%= class_if_current "#{current_section}/#{subtab}" %>><a href="<%= h current_section %>/<%= h subtab %>"><span><%= h subtab %></span></a></li>
       <% end %>
     </ul>
   <% end %>
@@ -38,7 +38,7 @@
 
 <div id="footer">
   <p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%=Resque::VERSION%></p>
-  <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%= h Resque.redis_id %></p>
+  <p>Connected to Redis namespace <%= h Resque.redis.namespace %> on <%= h Resque.redis_id %></p>
 </div>
 
 </body>

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

@@ -4,19 +4,19 @@
 <%if  start - per_page >= 0 || start + per_page <= size%>
   <div class='pagination'>
     <% if start - per_page >= 0 %>
-      <a href="<%= current_page %>?start=<%= start - per_page %>" class='less'>&laquo; Previous</a>
+      <a href="<%= h current_page %>?start=<%= start - per_page %>" class='less'>&laquo; Previous</a>
     <% end %>
 
     <% (size / per_page.to_f).ceil.times do |page_num| %>
       <% if start == page_num * per_page %>
         <span><%= page_num + 1 %></span>
       <% else %>
-        <a href="<%= current_page %>?start=<%= page_num * per_page %>"> <%= page_num + 1 %></a>
+        <a href="<%= h current_page %>?start=<%= page_num * per_page %>"> <%= page_num + 1 %></a>
       <% end %>
     <% end %>
 
     <% if start + per_page < size %>
-      <a href="<%= current_page %>?start=<%= start + per_page %>" class='more'>Next &raquo;</a>
+      <a href="<%= h current_page %>?start=<%= start + per_page %>" class='more'>Next &raquo;</a>
     <% end %>
   </div>
 <%end%>

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

@@ -1,2 +1,2 @@
 <%= partial :job_class, :job => job['payload'] %>
-<small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= job['run_at'] %></a></small>
+<small><a class="queue time" href="<%= h u("/working/#{worker}") %>"><%= h job['run_at'] %></a></small>

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

@@ -2,8 +2,8 @@
 
 <% if current_queue = params[:id] %>
 
-  <h1>Pending jobs on <span class='hl'><%= h escape_html(current_queue) %></span></h1>
-  <form method="POST" action="<%=u "/queues/#{escape_html(current_queue)}/remove" %>" class='remove-queue'>
+  <h1>Pending jobs on <span class='hl'><%= h current_queue %></span></h1>
+  <form method="POST" action="<%= h u("/queues/#{current_queue}/remove") %>" class='remove-queue'>
     <input type='submit' name='' value='Remove Queue' class="confirmSubmission" />
   </form>
   <p class='sub'><%= page_entries_info start = params[:start].to_i, start + 19, size = resque.size(current_queue), 'job' %></p>
@@ -36,14 +36,14 @@
     </tr>
     <% resque.queues.sort_by { |q| q.to_s }.each do |queue| %>
     <tr>
-      <td class='queue'><a class="queue" href="<%= u "queues/#{queue}" %>"><%= queue %></a></td>
+      <td class='queue'><a class="queue" href="<%= h u("queues/#{queue}") %>"><%= h queue %></a></td>
       <td class='size'><%= resque.size queue %></td>
     </tr>
     <% end %>
     <% if failed_multiple_queues? %>
       <% Resque::Failure.queues.sort_by { |q| q.to_s }.each_with_index do |queue, i| %>
       <tr class="<%= Resque::Failure.count(queue).zero? ? "failed" : "failure" %><%= " first_failure" if i.zero? %>">
-        <td class='queue failed'><a class="queue" href="<%= u "failed/#{queue}" %>"><%= queue %></a></td>
+        <td class='queue failed'><a class="queue" href="<%= h u("failed/#{queue}") %>"><%= h queue %></a></td>
         <td class='size'><%= Resque::Failure.count(queue) %></td>
       </tr>
       <% end %>

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

@@ -11,7 +11,7 @@
   <% for key, value in resque.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
       <th>
-        <%= key %>
+        <%= h key %>
       </th>
       <td>
         <%= h value %>
@@ -27,10 +27,10 @@
   <% for key, value in resque.redis.redis.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
       <th>
-        <%= key %>
+        <%= h key %>
       </th>
       <td>
-        <%= value %>
+        <%= h value %>
       </td>
     </tr>
   <% end %>
@@ -39,7 +39,7 @@
 <% elsif params[:id] == 'keys' %>
 
   <h1>Keys owned by <%= h resque.redis_id %></h1>
-  <p class='sub'>(All keys are actually prefixed with "<%= Resque.redis.namespace %>:")</p>
+  <p class='sub'>(All keys are actually prefixed with "<%= h Resque.redis.namespace %>:")</p>
   <table class='stats'>
     <tr>
       <th>key</th>
@@ -49,7 +49,7 @@
   <% for key in resque.keys.sort %>
     <tr>
       <th>
-        <a href="<%=u "/stats/keys/#{key}" %>"><%= key %></a>
+        <a href="<%= h u("/stats/keys/#{key}") %>"><%= h key %></a>
       </th>
       <td><%= resque.redis.type key %></td>
       <td><%= redis_get_size key %></td>

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

@@ -2,7 +2,7 @@
 
 <% if params[:id] && worker = Resque::Worker.find(params[:id]) %>
 
-  <h1>Worker <%= worker %></h1>
+  <h1>Worker <%= h worker %></h1>
   <table class='workers'>
     <tr>
       <th>&nbsp;</th>
@@ -16,14 +16,14 @@
       <th>Processing</th>
     </tr>
     <tr>
-      <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
+      <td class='icon'><img src="<%= h u(state = worker.state) %>.png" alt="<%= h state %>" title="<%= h state %>"></td>
 
       <% host, pid, queues = worker.to_s.split(':') %>
-      <td><%= host %></td>
-      <td><%= pid %></td>
-      <td><span class="time"><%= worker.started %></span></td>
-      <td><span class="time"><%= worker.heartbeat %></span></td>
-      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join('') %></td>
+      <td><%= h host %></td>
+      <td><%= h pid %></td>
+      <td><span class="time"><%= h worker.started %></span></td>
+      <td><span class="time"><%= h worker.heartbeat %></span></td>
+      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + h(u("/queues/#{q}")) + '">' + h(q) + '</a>'}.join('') %></td>
       <td><%= worker.processed %></td>
       <td><%= worker.failed %></td>
       <td class='process'>
@@ -60,11 +60,11 @@
     </tr>
     <% for worker in (workers = workers.sort_by { |w| w.to_s }) %>
     <tr class="<%=state = worker.state%>">
-      <td class='icon'><img src="<%=u state %>.png" alt="<%= state %>" title="<%= state %>"></td>
+      <td class='icon'><img src="<%= h u(state) %>.png" alt="<%= h state %>" title="<%= h state %>"></td>
 
       <% host, pid, queues = worker.to_s.split(':') %>
-      <td class='where'><a href="<%=u "workers/#{worker}"%>"><%= host %>:<%= pid %></a></td>
-      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join('') %></td>
+      <td class='where'><a href="<%= h u("workers/#{worker}") %>"><%= h host %>:<%= h pid %></a></td>
+      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + h(u("/queues/#{q}")) + '">' + h(q) + '</a>'}.join('') %></td>
 
       <td class='process'>
         <% data = worker.processing || {} %>
@@ -95,7 +95,7 @@
     </tr>
     <% for hostname, workers in worker_hosts.sort_by { |h,w| h } %>
     <tr>
-      <td class='queue'><a class="queue" href="<%= u "workers/#{hostname}" %>"><%= hostname %></a></td>
+      <td class='queue'><a class="queue" href="<%= h u("workers/#{hostname}") %>"><%= h hostname %></a></td>
       <td class='size'><%= workers.size %></td>
     </tr>
     <% end %>

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

@@ -1,5 +1,5 @@
 <% if params[:id] && (current_worker = Resque::Worker.find(params[:id])) && (data = current_worker.job) %>
-  <h1><%= current_worker %>'s job</h1>
+  <h1><%= h current_worker %>'s job</h1>
 
   <table>
     <tr>
@@ -13,13 +13,13 @@
       <tr>
         <td><img src="<%=u 'working.png' %>" alt="working" title="working"></td>
         <% host, pid, _ = current_worker.to_s.split(':') %>
-        <td><a href="<%=u "/workers/#{current_worker}" %>"><%= host %>:<%= pid %></a></td>
+        <td><a href="<%= h u("/workers/#{current_worker}") %>"><%= h host %>:<%= h pid %></a></td>
         <% queue = data['queue'] %>
-        <td><a class="queue" href="<%=u "/queues/#{queue}" %>"><%= queue %></a></td>
-        <td><span class="time"><%= data['run_at'] %></span></td>
+        <td><a class="queue" href="<%= h u("/queues/#{queue}") %>"><%= h queue %></a></td>
+        <td><span class="time"><%= h data['run_at'] %></span></td>
         <% payload = data.key?('payload') ? data['payload'] : {} %>
         <td>
-          <code><%= payload.key?('class') ? payload['class'] : "—" %></code>
+          <code><%= payload.key?('class') ? h(payload['class']) : "—" %></code>
         </td>
         <td><pre><%=h payload.key?('args') ? show_args(payload['args']) : "—" %></pre></td>
       </tr>
@@ -51,11 +51,11 @@
 
     <% worker_jobs.sort_by { |_w, j| j['run_at'] ? j['run_at'].to_s() : '' }.each do |worker, job| %>
       <tr>
-        <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
+        <td class='icon'><img src="<%= h u(state = worker.state) %>.png" alt="<%= h state %>" title="<%= h state %>"></td>
         <% host, pid, _queues = worker.to_s.split(':') %>
-        <td class='where'><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
+        <td class='where'><a href="<%= h u("/workers/#{worker}") %>"><%= h host %>:<%= h pid %></a></td>
         <td class='queues queue'>
-          <a class="queue-tag" href="<%=u "/queues/#{job['queue']}" %>"><%= job['queue'] %></a>
+          <a class="queue-tag" href="<%= h u("/queues/#{job['queue']}") %>"><%= h job['queue'] %></a>
         </td>
         <td class='process'>
           <% if job['queue'] %>

data/lib/resque/server.rb

@@ -168,7 +168,7 @@ module Resque
         stats << "queues.#{queue}=#{Resque.size(queue)}"
       end
 
-      content_type 'text/html'
+      content_type 'text/plain'
       stats.join "\n"
     end
 

data/lib/resque/server_helper.rb

@@ -29,7 +29,7 @@ module Resque
     def tab(name)
       dname = name.to_s.downcase
       path = url_path(dname)
-      "<li #{class_if_current(path)}><a href='#{path.gsub(" ", "_")}'>#{name}</a></li>"
+      "<li #{class_if_current(path)}><a href='#{h path.gsub(" ", "_")}'>#{h name}</a></li>"
     end
 
     def tabs
@@ -112,7 +112,7 @@ module Resque
       if defined?(@polling) && @polling
         text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
       else
-        text = "<a href='#{u(request.path_info)}.poll' rel='poll'>Live Poll!!</a>"
+        text = "<a href='#{h u(request.path_info)}.poll' rel='poll'>Live Poll!!</a>"
       end
       "<p class='poll'>#{text}</p>"
     end

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  VERSION = '3.0.0'
+  VERSION = '3.0.2'
 end

data/lib/resque/web_runner.rb

@@ -85,7 +85,8 @@ module Resque
     end
 
     def url
-      "http://#{host}:#{port}"
+      h = host.include?(':') ? "[#{host}]" : host
+      "http://#{h}:#{port}"
     end
 
     def before_run

data/lib/resque.rb

@@ -31,8 +31,15 @@ module Resque
 
   # Given a Ruby object, returns a string suitable for storage in a
   # queue.
+  #
+  # multi_json has renamed its core methods twice: first encode/decode became
+  # dump/load, then multi_json 1.21 renamed dump/load to generate/parse. Old
+  # names keep working as deprecated aliases. Check the newest name first so
+  # we prefer it while staying compatible with older installed versions.
   def encode(object)
-    if MultiJson.respond_to?(:dump) && MultiJson.respond_to?(:load)
+    if MultiJson.respond_to?(:generate) && MultiJson.respond_to?(:parse)
+      MultiJson.generate object
+    elsif MultiJson.respond_to?(:dump) && MultiJson.respond_to?(:load)
       MultiJson.dump object
     else
       MultiJson.encode object
@@ -40,16 +47,20 @@ module Resque
   end
 
   # Given a string, returns a Ruby object.
+  #
+  # See `Resque.encode`, above, for why generate/parse are checked before dump/load.
   def decode(object)
     return unless object
 
     begin
-      if MultiJson.respond_to?(:dump) && MultiJson.respond_to?(:load)
+      if MultiJson.respond_to?(:generate) && MultiJson.respond_to?(:parse)
+        MultiJson.parse object
+      elsif MultiJson.respond_to?(:dump) && MultiJson.respond_to?(:load)
         MultiJson.load object
       else
         MultiJson.decode object
       end
-    rescue ::MultiJson::DecodeError => e
+    rescue MultiJson::DecodeError => e
       raise Helpers::DecodeException, e.message, e.backtrace
     end
   end
@@ -251,7 +262,7 @@ module Resque
     register_hook(:before_fork, block)
   end
 
-  # The `after_fork` hook will be run in the child process and is passed
+  # The `after_fork` hook will be run in the **child** process and is passed
   # the current job. Any changes you make, therefore, will only live as
   # long as the job currently being processed.
   #
@@ -266,7 +277,7 @@ module Resque
     register_hook(:after_fork, block)
   end
 
-  # The `before_pause` hook will be run in the parent process before the
+  # The `before_pause` hook will be run in the **parent** process before the
   # worker has paused processing (via #pause_processing or SIGUSR2).
   def before_pause(&block)
     block ? register_hook(:before_pause, block) : hooks(:before_pause)
@@ -277,7 +288,7 @@ module Resque
     register_hook(:before_pause, block)
   end
 
-  # The `after_pause` hook will be run in the parent process after the
+  # The `after_pause` hook will be run in the **parent** process after the
   # worker has paused (via SIGCONT).
   def after_pause(&block)
     block ? register_hook(:after_pause, block) : hooks(:after_pause)
@@ -316,7 +327,7 @@ module Resque
     register_hook(:worker_exit, block)
   end
 
-  # The `shutdown` hook will be run in the **child** process
+  # The `shutdown` hook will be run in the **parent** process
   # when the worker has received a signal to stop processing
   #
   # Call with a block to register a hook.

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Chris Wanstrath
 - Steve Klabnik
 - Terence Lee
 - Michael Bianco
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-01-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -229,7 +228,6 @@ licenses:
 metadata:
   changelog_uri: https://github.com/resque/resque/blob/master/HISTORY.md
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -245,8 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Resque is a Redis-backed queueing system.
 test_files: []