sidekiq-benchmark 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b2583957b88fb1d556a08a53abe16bc823914ec
-  data.tar.gz: d084d3be5a35c882326c9d3f8df418c0a9c2bca6
+  metadata.gz: 1f1b169c529b283e1e168119469196b3e597cb52
+  data.tar.gz: 4baa60ef47937686077547331e5a993b0d0642ef
 SHA512:
-  metadata.gz: b0662eec56c195a7077a263c10926e6b7484fde4fb54b7f0d45db8b70e61e74847bf2f35b9c1c9d1a60671362f6ee6970306358af0381e79073013facc47db05
-  data.tar.gz: 1e7042f4b933e3776cbeaea2cf682a86a69ffc1416f4da4784110036439e0ad9d85f98dc24d5b043e0f1eec7c3f67a5587a20dae443d2e019b576fbb46000ca0
+  metadata.gz: 80d23555c511e4d08ab7a284ddf1069635ed153020798f5655ab0ec85f84c3a2a480beebb8f7c37ca4a6eed376ca3a3a0639d7eb74ce85d71ad8eed91da097a6
+  data.tar.gz: 0f577d9211c64b8e63f725b09312eff473eea8e3c4048e9d70877e9922d8f4746cb3e1db385a7999ef4e3e775b79d0cc8f39788fc978dd5d00cb673a6787580a

data/README.md

@@ -19,7 +19,7 @@ And then execute:
 
 ## Requirements
 
-Redis 2.6.0 or newer required
+From version 0.5.0 works with Sidekiq 4.2 or newer
 
 ## Usage
 
@@ -92,6 +92,3 @@ require 'sidekiq-benchmark/testing'
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-
-[![endorse](https://api.coderwall.com/kosmatov/endorsecount.png)](https://coderwall.com/kosmatov)

data/lib/sidekiq-benchmark.rb

@@ -8,6 +8,7 @@ module Sidekiq
   module Benchmark
     REDIS_NAMESPACE = :benchmark
     TYPES_KEY = "#{REDIS_NAMESPACE}:types".freeze
+    STAT_KEYS = %i[stats total]
     REDIS_KEYS_TTL = 3600 * 24 * 30
 
     autoload :Worker, 'sidekiq-benchmark/worker'

data/lib/sidekiq-benchmark/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Benchmark
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/sidekiq-benchmark/web.rb

@@ -23,11 +23,11 @@ module Sidekiq
           @charts = {}
 
           Sidekiq.redis do |conn|
-            @types = conn.smembers Sidekiq::Benchmark::TYPES_KEY
+            @types = conn.smembers TYPES_KEY
             @types.each do |type|
-              @charts[type] = { total: [], stats: [] }
+              @charts[type] = STAT_KEYS.reduce({}) { |a, e| a[e] = []; a }
 
-              total_key = "#{Sidekiq::Benchmark::REDIS_NAMESPACE}:#{type}:total"
+              total_key = "#{REDIS_NAMESPACE}:#{type}:total"
               total_keys = conn.hkeys(total_key) - %w(start_time job_time finish_time)
 
               total_time = conn.hget total_key, :job_time
@@ -37,7 +37,7 @@ module Sidekiq
                 @charts[type][:total] << [key, value.to_f.round(2)]
               end
 
-              stats = conn.hgetall "#{Sidekiq::Benchmark::REDIS_NAMESPACE}:#{type}:stats"
+              stats = conn.hgetall "#{REDIS_NAMESPACE}:#{type}:stats"
               stats.each do |key, value|
                 @charts[type][:stats] << [key.to_f, value.to_i]
               end
@@ -52,7 +52,20 @@ module Sidekiq
 
         app.post "/benchmarks/remove" do
           Sidekiq.redis do |conn|
-            keys = conn.keys "benchmark:*"
+            keys = STAT_KEYS.map { |key| "#{REDIS_NAMESPACE}:#{params[:type]}:#{key}" }
+            conn.srem TYPES_KEY, params[:type]
+            conn.del keys
+          end
+
+          redirect "#{root_path}benchmarks"
+        end
+        app.post "/benchmarks/remove_all" do
+          Sidekiq.redis do |conn|
+            types = conn.smembers TYPES_KEY
+            keys = STAT_KEYS.map do |key|
+              types.map { |type| "#{REDIS_NAMESPACE}:#{type}:#{key}" }
+            end.flatten
+            keys << TYPES_KEY
             conn.del keys
           end
 

data/lib/sidekiq-benchmark/worker.rb

@@ -68,8 +68,8 @@ module Sidekiq
 
         def set_redis_key(key)
           Sidekiq.redis do |conn|
-            conn.sadd Sidekiq::Benchmark::TYPES_KEY, key
-            conn.expire Sidekiq::Benchmark::TYPES_KEY, REDIS_KEYS_TTL
+            conn.sadd TYPES_KEY, key
+            conn.expire TYPES_KEY, REDIS_KEYS_TTL
           end
         end
 

data/test/lib/web_test.rb

@@ -14,33 +14,38 @@ module Sidekiq
           Test.flush_db
         end
 
-        it "should display index without stats" do
+        it "display index without stats" do
           get '/benchmarks'
           last_response.status.must_equal 200
         end
 
-        it "should display index with stats" do
+        it "display index with stats" do
           WorkerMock.new
 
           get '/benchmarks'
           last_response.status.must_equal 200
         end
 
-        it "should remove benchmarks data" do
+        it "remove all benchmarks data" do
           WorkerMock.new
 
-          Sidekiq.redis do |conn|
-            keys = conn.keys "benchmark:*"
-            keys.wont_be_empty
-          end
+          Sidekiq.redis { |conn| conn.keys("benchmark:*").wont_be_empty }
 
-          post '/benchmarks/remove'
+          post '/benchmarks/remove_all'
           last_response.status.must_equal 302
 
-          Sidekiq.redis do |conn|
-            keys = conn.keys "benchmark:*"
-            keys.must_be_empty
-          end
+          Sidekiq.redis { |conn| conn.keys("benchmark:*").must_be_empty }
+        end
+
+        it "remove benchmark data" do
+          WorkerMock.new
+
+          Sidekiq.redis { |conn| conn.keys("benchmark:sidekiq_benchmark_test_workermock:*").wont_be_empty }
+
+          post '/benchmarks/remove', type: :sidekiq_benchmark_test_workermock
+          last_response.status.must_equal 302
+
+          Sidekiq.redis { |conn| conn.keys("benchmark:sidekiq_benchmark_test_workermock:*").must_be_empty }
         end
       end
     end

data/web/views/benchmarks.erb

@@ -5,11 +5,33 @@
   <div class="col-md-6">
     <h3>Benchmarks</h3>
   </div>
+
+  <div class="col-md-6">
+    <form method="POST" class="warning-messages" action="<%= root_path %>benchmarks/remove_all">
+      <%= csrf_tag %>
+      <div class="pull-right">
+        <button class="btn btn-danger" type="submit" name="clear" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('DeleteAll') %></button>
+      </div>
+    </form>
+  </div>
 </header>
 
-<section>
 <% @types.each do |type| %>
-  <h4><%= type %></h4>
+<section>
+  <div class="row">
+    <div class="col-md-6">
+      <h4><%= type %></h4>
+    </div>
+    <div class="col-md-6">
+      <form method="POST" class="warning-messages" action="<%= root_path %>benchmarks/remove">
+        <%= csrf_tag %>
+        <div class="pull-right">
+          <input type="hidden" name="type" value="<%= type %>"/>
+          <button class="btn btn-danger" type="submit" name="clear" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('Delete') %></button>
+        </div>
+      </form>
+    </div>
+  </div>
   <figure class="row">
     <div class="col-md-7">
       <h5>Amount of tasks by execution time</h5>
@@ -20,5 +42,5 @@
       <%= pie_chart @charts[type][:total] %>
     </div>
   </figure>
-<% end %>
 </section>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Konstantin Kosmatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick