sidekiq-failures 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3a32d193a70834983a509cda264943a04cf76d
-  data.tar.gz: 946c4d36eab67ffd4b16b1e4e5dece3699be0f5a
+  metadata.gz: 71027ff19b10b529acabafaba413fb8e6c79cd94
+  data.tar.gz: b8d994984de5da5050c78962704169f30f6c4e60
 SHA512:
-  metadata.gz: 322bccce2ceacf773accdc94f9f693fc4c74286308aa2470cde98b731fedace3497514114161851194b074c44aa09179c36cc7824523297ad7b31da0480b2a05
-  data.tar.gz: ef0caebd8929b2f98bb1a7956bfea0b9806198bb72f29d3ee971e7381d44b68b8fea6766aba82c8c3813ec0ad41d9b4ea05b5da773aea4d9d60bd913922c082a
+  metadata.gz: 5eb5e39114e6a384d8285dd6e9e4d32d62d6dc8adbfaa76c55af1f7bce617bb93fc5242cba0c24c87168ec7d7fa450880d602e7f06b341d09f378aefb73957f6
+  data.tar.gz: d5e89bad2b074dedc2d64976becae9d30651aae28c55799572c3870db87de42c4f8e8b1903f4d50f9fdb0b8c97b6959cc5ae88e95db41615ac981e77e8981d56

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Unreleased
 
+## 0.4.1
+  * Restore compatibility for failed payloads created with 0.3.0
+
 ## 0.4.0
   * Bump sidekiq dependency to sidekiq >= 2.16.0
   * Introduce delete(all) / retry(all) (@spectator)

data/lib/sidekiq/failures/sorted_entry.rb

@@ -1,5 +1,14 @@
 module Sidekiq
   class SortedEntry
+    alias_method :super_initialize, :initialize
+
+    def initialize(parent, score, item)
+      super_initialize(parent, score, item)
+
+      # 0.3.0 compatibility
+      @item.merge!(@item["payload"]) if @item["payload"]
+    end
+
     def retry_failure
       Sidekiq.redis do |conn|
         results = conn.zrangebyscore(Sidekiq::Failures::LIST_KEY, score, score)

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/test/web_extension_test.rb

@@ -135,6 +135,39 @@ module Sidekiq
       end
     end
 
+    describe 'when there are failures with deprecated format' do
+      before do
+        create_sample_failure(args: nil, payload: { args: ['bob', 5] })
+        get '/failures'
+      end
+
+      it 'should be successful' do
+        last_response.status.must_equal 200
+      end
+
+      it 'can display failures page with failures listed' do
+        last_response.body.must_match /Failed Jobs/
+        last_response.body.must_match /HardWorker/
+        last_response.body.must_match /ArgumentError/
+        last_response.body.wont_match /No failed jobs found/
+      end
+    end
+
+    describe 'when there are failures with unescaped data' do
+      before do
+        create_sample_failure(args: ['<h1>omg</h1>'], error_message: '<p>wow</p>')
+        get '/failures'
+      end
+
+      it 'can escape arguments' do
+        last_response.body.must_match /&quot;&lt;h1&gt;omg&lt;&#x2F;h1&gt;&quot;/
+      end
+
+      it 'can escape error message' do
+        last_response.body.must_match /ArgumentError: &lt;p&gt;wow&lt;&#x2F;p&gt;/
+      end
+    end
+
     describe 'when there is failure' do
       before do
         create_sample_failure
@@ -177,7 +210,7 @@ module Sidekiq
       end
     end
 
-    def create_sample_failure
+    def create_sample_failure(data = {})
       data = {
         :queue => 'default',
         :class => 'HardWorker',
@@ -188,7 +221,7 @@ module Sidekiq
         :error_class     => 'ArgumentError',
         :error_message   => 'Some new message',
         :error_backtrace => ["path/file1.rb", "path/file2.rb"]
-      }
+      }.merge(data)
 
       Sidekiq.redis do |c|
         c.multi do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Marcelo Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq