sidekiq-failures 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8e45759e8632e06c43e6d68074a4c12c8e4ad6
-  data.tar.gz: 9388a41322307036eeee488e71be8695c481fa9b
+  metadata.gz: dbf773e3881e5c3f66679dc77ce221997c58442d
+  data.tar.gz: 8fde6abd64a06cd529e7bf523a8f018c68cd9900
 SHA512:
-  metadata.gz: 1975b9a74bbaea66c03dad69e62b5ed007a4137cd0c9d634238d0a4f15bb28f6a6eb0aa3395433392f0d19f6408f655ebf944052623fd4fad55b40460c6f5750
-  data.tar.gz: dc950ec4c3015ddfab679297011e284127ffb16adb62ad931b8e7cb049aafa303b2f29dfbd05bbe9b19c1764be569870b92173b98150488c443d199597291fa0
+  metadata.gz: 61dc54a740b82bd9317bec3240468dcd9fdb30663cc2eea05c2368fb117c307e5eeb2979388309177fd7c5a1bec692997e041675d6bba5d11265e95d8492a069
+  data.tar.gz: 58fca490bba04d832220c1ee1689cb19adfb6a0b457d76fbd79f82b1171ace187990cd47147f3ac8c081bcf36453bb1aa0d858b923bdb2f91058048b27984050

data/.gitignore

@@ -15,3 +15,6 @@ test/tmp
 test/version_tmp
 tmp
 Gemfile.lock
+.ruby-version
+.ruby-gemset
+

data/.travis.yml

@@ -8,9 +8,10 @@ rvm:
   - 2.1
 env:
   matrix:
-    - SIDEKIQ_VERSION="~> 2.16.0"
-    - SIDEKIQ_VERSION="~> 2.17.0"
-    - SIDEKIQ_VERSION="~> 3.0.0"
+    - SIDEKIQ_VERSION="~> 2.16"
+    - SIDEKIQ_VERSION="~> 2.17"
+    - SIDEKIQ_VERSION="~> 3.0"
+    - SIDEKIQ_VERSION="~> 3.1"
 matrix:
   allow_failures:
     - rvm: 1.9.3

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Unreleased
 
+## 0.4.3
+  * Handle numeric timestamps format (@krasnoukhov)
+
 ## 0.4.2
   * Bump sidekiq dependency to 2.16.0 (@davetoxa)
   * Handle legacy timestamps (@maltoe)

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

data/lib/sidekiq/failures/views/failures.erb

@@ -41,7 +41,7 @@
           <td>
             <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= relative_time(entry['failed_at'].is_a?(Float) ? Time.at(entry['failed_at']) : Time.parse(entry['failed_at'])) %></td>
+          <td><%= safe_relative_time(entry['failed_at']) %></td>
           <td style="overflow: auto; padding: 10px;">
             <a class="backtrace" href="#" onclick="$(this).next().toggle(); return false">
               <%= h entry['error_class'] %>: <%= h entry['error_message'] %>

data/lib/sidekiq/failures/web_extension.rb

@@ -5,6 +5,18 @@ module Sidekiq
       def self.registered(app)
         view_path = File.join(File.expand_path("..", __FILE__), "views")
 
+        app.helpers do
+          def safe_relative_time(time)
+            time = if time.is_a?(Numeric)
+              Time.at(time)
+            else
+              Time.parse(time)
+            end
+
+            relative_time(time)
+          end
+        end
+
         app.get "/failures" do
           @count = (params[:count] || 25).to_i
           (@current_page, @total_size, @failures) = page(LIST_KEY, params[:page], @count)

data/test/web_extension_test.rb

@@ -135,50 +135,6 @@ 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 are failures with old timestamp format' do
-      before do
-        create_sample_failure failed_at: Time.now.strftime('%Y-%m-%dT%H:%M:%SZ')
-        get '/failures'
-      end
-
-      it 'should be successful' do
-        last_response.status.must_equal 200
-      end
-    end
-
     describe 'when there is failure' do
       before do
         create_sample_failure
@@ -221,6 +177,47 @@ module Sidekiq
       end
     end
 
+    describe 'when there is specific failure' do
+      describe '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 'with deprecated payload' 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
+          last_response.body.wont_match /No failed jobs found/
+        end
+      end
+
+      describe 'with deprecated timestamp' do
+        before do
+          create_sample_failure(failed_at: Time.now.strftime('%Y-%m-%dT%H:%M:%SZ'))
+          get '/failures'
+        end
+
+        it 'should be successful' do
+          last_response.status.must_equal 200
+          last_response.body.wont_match /No failed jobs found/
+        end
+      end
+    end
+
     def create_sample_failure(data = {})
       data = {
         :queue => 'default',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Marcelo Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq