sidekiq-reset_statistics 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5619fdb46cfb1820c15c0b524ba349c883514324
-  data.tar.gz: eaf5bab3bcf0e681183e0a713972938ee5d73f47
+  metadata.gz: 7eb64a314a3efea7e626b77b0a7e1efba7bf69ea
+  data.tar.gz: 06f12568a63d1abcf34cf53fa157808b95c7b0a1
 SHA512:
-  metadata.gz: f3cd75d7f2d6e71d48a8a563597c4b5bbecaca8e7e8e1c23535e4f2d7ad471da9707a48273590e75b7b86555e5d53de49dbdf2c85d4a92a2a50bad856595a725
-  data.tar.gz: fc5e09b8f32f1cda49e224d2adef152b67cb4295095dad2959bf8050235a2aaa1cc2e2b6b7593c3331f7d80ddc9f22f75f4920b3622c8402ed9c52d80448b21d
+  metadata.gz: cab24524b9f8388d64b7555f956e7b21cf3ca59daf8b362b72b6a3b6f2f434c6414a3285d150245235992eced901db9bfe78d45542b03442f0445a4e08b64b98
+  data.tar.gz: 2deefca85797f5b223626074aaa0547af9d0f2b5bfec254118775d09d34cd9e15ee77e6fb61e643e54733800493231b7e0bdccde12b4a3cfa955c992fc1a683d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.0 (2014-01-12)
+
+* Use updated `Sidekiq::Stats#reset` to reset individual stats independently. Thanks @bwthomas
+
 ## 1.0.0 (2013-09-12)
 
 * Initial release

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 David Czarnecki
+Copyright (c) 2013-2014 David Czarnecki
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -22,4 +22,4 @@ gem 'sidekiq-reset_statistics'
 
 ## Copyright
 
-Copyright (c) 2013 David Czarnecki. See LICENSE.txt for further details.
+Copyright (c) 2013-2014 David Czarnecki. See LICENSE.txt for further details.

data/lib/sidekiq-reset_statistics/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module ResetStatistics
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/sidekiq-reset_statistics/web.rb

@@ -10,10 +10,21 @@ module Sidekiq
         end
 
         app.post "/reset-statistics" do
-          Sidekiq::Stats.new.reset
+          stats  = Sidekiq::Stats.new
+          resets = params.values.grep(/Reset (?!All)/)
+
+          if resets.empty?
+            stats.reset
+          elsif stats.method(:reset).arity != -1
+            raise StandardError, "Version mismatch. Please upgrade Sidekiq."
+          else
+            counts = resets.map {|r| r.split.last.downcase }
+            stats.reset(*counts)
+          end
+
           redirect root_path
         end
       end
     end
   end
-end
+end

data/spec/sidekiq-reset_statistics/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe 'Sidekiq::ResetStatistics::VERSION' do
   it 'should be the correct version' do
-    Sidekiq::ResetStatistics::VERSION.should == '1.0.0'
+    Sidekiq::ResetStatistics::VERSION.should == '1.1.0'
   end
 end

data/spec/sidekiq-reset_statistics/web_spec.rb

@@ -3,27 +3,74 @@ require 'spec_helper'
 describe Sidekiq::ResetStatistics::Web do
   include Rack::Test::Methods
 
-  before do
-    Sidekiq.redis { |conn| conn.flushdb }
-  end
+  STATS = %w(processed failed).freeze unless defined?(STATS)
 
   def app
     @app ||= Sidekiq::Web
   end
 
+  before do
+    Sidekiq.redis do |conn|
+      conn.flushdb
+      STATS.each { |stat| conn.set("stat:#{stat}", 5) }
+    end
+  end
+
   it 'should display the index page' do
     get '/reset-statistics'
     last_response.status.should == 200
   end
 
-  it 'should reset statistics in Sidekiq' do
+  it 'should reset all statistics in Sidekiq by default' do
+    post '/reset-statistics'
+    last_response.status.should == 302
+
+    Sidekiq.redis do |conn|
+      STATS.each { |stat| conn.get("stat:#{stat}").should == '0' }
+    end
+  end
+
+  it 'should reset all statistics in Sidekiq when asked' do
+    post '/reset-statistics', :reset_all => 'Reset All'
+    last_response.status.should == 302
+
     Sidekiq.redis do |conn|
-      conn.set('stat:processed', 5)
-      conn.set('stat:failed', 10)
-      post '/reset-statistics'
+      STATS.each { |stat| conn.get("stat:#{stat}").should == '0' }
+    end
+  end
+
+  STATS.each do |stat|
+    it "should reset #{stat} when asked" do
+      post '/reset-statistics', "reset_#{stat}" => "Reset #{stat.capitalize}"
       last_response.status.should == 302
-      conn.get('stat:processed').should == '0'
-      conn.get('stat:failed').should == '0'
+
+      Sidekiq.redis do |conn|
+        conn.get("stat:#{stat}").should == '0'
+      end
+    end
+  end
+
+  context 'version mismatch' do
+    before do
+      method_class          = String.method(:new).class
+      instance_method_class = String.instance_method(:size).class
+      method_class.any_instance.stub(:arity => 0)
+      instance_method_class.any_instance.stub(:arity => 0)
+    end
+
+    it 'should not raise an error when requested action is compatible with sidekiq' do
+      post '/reset-statistics', :reset_all => 'Reset All'
+      last_response.status.should == 302
+
+      Sidekiq.redis do |conn|
+        STATS.each { |stat| conn.get("stat:#{stat}").should == '0' }
+      end
+    end
+
+    it 'should raise an error when requested action is incompatible with sidekiq' do
+      post '/reset-statistics', :reset_foo => 'Reset Foo'
+      last_response.status.should == 500
+      last_response.errors.should include('Version mismatch. Please upgrade Sidekiq')
     end
   end
-end
+end

data/web/views/reset_statistics.erb

@@ -1,3 +1,7 @@
 <form action="<%= root_path %>reset-statistics" method="post">
-  <input class="btn btn-danger pull-left" type="submit" name="reset_statistics" value="Reset Sidekiq Statistics" data-confirm="<%= t('AreYouSure') %>"/>
-</form>
+  <% if Sidekiq::Stats.instance_method(:reset).arity == -1 %>
+    <input class="btn btn-danger pull-left" type="submit" name="reset_processed"  value="Reset Processed" data-confirm="<%= t('AreYouSure') %>"/>
+    <input class="btn btn-danger pull-left" type="submit" name="reset_failed"     value="Reset Failed"    data-confirm="<%= t('AreYouSure') %>"/>
+  <% end %>
+  <input class="btn btn-danger pull-left" type="submit" name="reset_all"        value="Reset All"       data-confirm="<%= t('AreYouSure') %>"/>
+</form>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-reset_statistics
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - David Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sidekiq-reset_statistics
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Adds a tab to your Sidekiq dashboard to allow you to reset Sidekiq statistics