sidekiq-benchmark 0.1.1 → 0.1.2

data/README.md

@@ -6,7 +6,8 @@ Version](https://badge.fury.io/rb/sidekiq-benchmark.png)](https://rubygems.org/g
 [![Coverage
 Status](https://coveralls.io/repos/kosmatov/sidekiq-benchmark/badge.png?branch=master)](https://coveralls.io/r/kosmatov/sidekiq-benchmark)
 
-Adds benchmarking methods to Sidekiq workers, keeps metrics and adds tab to Web UI to let you browse them.
+Adds benchmarking methods to
+[Sidekiq](https://github.com/mperham/sidekiq) workers, keeps metrics and adds tab to Web UI to let you browse them.
 
 ## Installation
 

data/lib/sidekiq-benchmark/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Benchmark
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/sidekiq-benchmark/web.rb

@@ -39,6 +39,9 @@ module Sidekiq
               stats.each do |key, value|
                 @charts[type][:stats] << [key.to_f, value.to_i]
               end
+
+              @charts[type][:stats].sort! { |a, b| a[0] <=> b[0] }
+              @charts[type][:stats].map! { |a| [a[0].to_s, a[1]] }
             end
           end
 

data/test/lib/web_test.rb

@@ -25,6 +25,23 @@ module Sidekiq
           get '/benchmarks'
           last_response.status.must_equal 200, last_response.body
         end
+
+        it "should remove benchmarks data" do
+          WorkerMock.new
+
+          Sidekiq.redis do |conn|
+            keys = conn.keys "benchmark:*"
+            keys.wont_be_empty
+          end
+
+          post '/benchmarks/remove'
+          last_response.status.must_equal 302
+
+          Sidekiq.redis do |conn|
+            keys = conn.keys "benchmark:*"
+            keys.must_be_empty
+          end
+        end
       end
     end
   end

data/test/lib/worker_test.rb

@@ -16,20 +16,21 @@ module Sidekiq
           metrics = @worker.bm_obj.metrics
 
           @worker.metric_names.each do |metric_name|
-            assert metrics[metric_name]
+            metrics[metric_name].wont_be_nil
           end
 
-          assert @worker.bm_obj.start_time
-          assert @worker.bm_obj.finish_time
+          @worker.bm_obj.start_time.wont_be_nil
+          @worker.bm_obj.finish_time.wont_be_nil
+          metrics[:assigned_metric].must_equal @worker.assigned_metric
         end
 
         it "should save metrics to redis" do
           Sidekiq.redis do |conn|
             total_time = conn.hget("#{@worker.benchmark_redis_base_key}:total", :job_time)
-            assert total_time, "Total time: #{total_time.inspect}"
+            total_time.wont_be_nil
 
             metrics = conn.hkeys("#{@worker.benchmark_redis_base_key}:stats")
-            assert metrics.any?, "Metrics: #{metrics.inspect}"
+            metrics.wont_be_empty
           end
         end
       end

data/test/test_helper.rb

@@ -24,9 +24,11 @@ module Sidekiq
         include Sidekiq::Worker
         include Sidekiq::Benchmark::Worker
 
-        attr_reader :bm_obj, :metric_names
+        attr_reader :bm_obj, :metric_names, :assigned_metric
 
         def initialize
+          @assigned_metric = 0.1
+
           @bm_obj = benchmark do |bm|
             bm.test_metric do
               2.times do |i|
@@ -36,6 +38,8 @@ module Sidekiq
                 end
               end
             end
+
+            bm.assigned_metric @assigned_metric
           end
 
           @metric_names = [:test_metric, :nested_test_metric_1, :job_time]

data/web/assets/javascripts/chartkick.js

@@ -1,46 +1,51 @@
+/*
+ * Chartkick.js
+ * Create beautiful Javascript charts with minimal code
+ * https://github.com/ankane/chartkick.js
+ * v1.0.2
+ * MIT License
+ */
+
 /*jslint browser: true, indent: 2, plusplus: true */
 /*global google, $*/
 
 (function() {
   'use strict';
 
-  // http://stackoverflow.com/questions/728360/most-elegant-way-to-clone-a-javascript-object
-  function clone(obj) {
-    var copy, i, attr, len;
-
-    // Handle the 3 simple types, and null or undefined
-    if (null === obj || "object" !== typeof obj) {
-      return obj;
-    }
+  // helpers
 
-    // Handle Date
-    if (obj instanceof Date) {
-      copy = new Date();
-      copy.setTime(obj.getTime());
-      return copy;
-    }
+  function isArray(variable) {
+    return Object.prototype.toString.call(variable) === "[object Array]";
+  }
 
-    // Handle Array
-    if (obj instanceof Array) {
-      copy = [];
-      for (i = 0, len = obj.length; i < len; i++) {
-        copy[i] = clone(obj[i]);
-      }
-      return copy;
-    }
+  function isPlainObject(variable) {
+    return variable instanceof Object;
+  }
 
-    // Handle Object
-    if (obj instanceof Object) {
-      copy = {};
-      for (attr in obj) {
-        if (obj.hasOwnProperty(attr)) {
-          copy[attr] = clone(obj[attr]);
+  // https://github.com/madrobby/zepto/blob/master/src/zepto.js
+  function extend(target, source) {
+    var key;
+    for (key in source) {
+      if (isPlainObject(source[key]) || isArray(source[key])) {
+        if (isPlainObject(source[key]) && !isPlainObject(target[key])) {
+          target[key] = {};
+        }
+        if (isArray(source[key]) && !isArray(target[key])) {
+          target[key] = [];
         }
+        extend(target[key], source[key]);
+      }
+      else if (source[key] !== undefined) {
+        target[key] = source[key];
       }
-      return copy;
     }
+  }
 
-    throw new Error("Unable to copy obj! Its type isn't supported.");
+  function merge(obj1, obj2) {
+    var target = {};
+    extend(target, obj1);
+    extend(target, obj2);
+    return target;
   }
 
   // https://github.com/Do/iso8601.js
@@ -93,10 +98,11 @@
 
   function jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax) {
     return function(series, opts) {
-      var options = clone(defaultOptions);
+      var options = merge({}, defaultOptions);
 
       // hide legend
-      if (series.length === 1) {
+      // this is *not* an external option!
+      if (opts.hideLegend) {
         hideLegend(options);
       }
 
@@ -113,6 +119,9 @@
         setMax(options, opts.max);
       }
 
+      // merge library last
+      options = merge(options, opts.library || {});
+
       return options;
     };
   }
@@ -173,7 +182,7 @@
     renderLineChart = function(element, series, opts) {
       var options = jsOptions(series, opts), data, i, j;
       options.xAxis.type = "datetime";
-      options.chart = {type: "spline"};
+      options.chart = {type: "spline", renderTo: element.id};
 
       for (i = 0; i < series.length; i++) {
         data = series[i].data;
@@ -183,22 +192,23 @@
         series[i].marker = {symbol: "circle"};
       }
       options.series = series;
-      $(element).highcharts(options);
+      new Highcharts.Chart(options);
     };
 
     renderPieChart = function(element, series, opts) {
-      var options = clone(defaultOptions);
+      var options = merge(defaultOptions, opts.library || {});
+      options.chart = {renderTo: element.id};
       options.series = [{
         type: "pie",
         name: "Value",
         data: series
       }];
-      $(element).highcharts(options);
+      new Highcharts.Chart(options);
     };
 
     renderColumnChart = function(element, series, opts) {
       var options = jsOptions(series, opts), i, j, s, d, rows = [];
-      options.chart = {type: "column"};
+      options.chart = {type: "column", renderTo: element.id};
 
       for (i = 0; i < series.length; i++) {
         s = series[i];
@@ -234,7 +244,7 @@
       }
       options.series = newSeries;
 
-      $(element).highcharts(options);
+      new Highcharts.Chart(options);
     };
   } else if ("google" in window) { // Google charts
     // load from google
@@ -330,6 +340,10 @@
           rows2.push([(columnType === "datetime") ? new Date(toFloat(i)) : i].concat(rows[i]));
         }
       }
+      if (columnType === "datetime") {
+        rows2.sort(sortByTime);
+      }
+
       data.addRows(rows2);
 
       return data;
@@ -346,7 +360,7 @@
 
     renderPieChart = function(element, series, opts) {
       waitForLoaded(function() {
-        var options = clone(defaultOptions);
+        var options = merge(defaultOptions, opts.library || {});
         options.chartArea = {
           top: "10%",
           height: "80%"
@@ -420,12 +434,6 @@
     }
   }
 
-  // helpers
-
-  function isArray(variable) {
-    return Object.prototype.toString.call(variable) === "[object Array]";
-  }
-
   // type conversions
 
   function toStr(n) {
@@ -469,12 +477,15 @@
     return a[0].getTime() - b[0].getTime();
   }
 
-  function processSeries(series, time) {
+  function processSeries(series, opts, time) {
     var i, j, data, r, key;
 
     // see if one series or multiple
     if (!isArray(series) || typeof series[0] !== "object" || isArray(series[0])) {
       series = [{name: "Value", data: series}];
+      opts.hideLegend = true;
+    } else {
+      opts.hideLegend = false;
     }
 
     // right format
@@ -496,11 +507,11 @@
   }
 
   function processLineData(element, data, opts) {
-    renderLineChart(element, processSeries(data, true), opts);
+    renderLineChart(element, processSeries(data, opts, true), opts);
   }
 
   function processColumnData(element, data, opts) {
-    renderColumnChart(element, processSeries(data, false), opts);
+    renderColumnChart(element, processSeries(data, opts, false), opts);
   }
 
   function processPieData(element, data, opts) {

data/web/views/benchmarks.slim

@@ -11,8 +11,9 @@ section
       h4= type
       figure.row
         .span5
-          h5 Count jobs by execution time
-          == column_chart @charts[type][:stats]
+          h5 Amount of tasks by execution time
+          == column_chart @charts[type][:stats],
+            library: { hAxis: { title: "Execution time" }, vAxis: { title: "Tasks" } }
         .span4
           h5 Average execution time
           == pie_chart @charts[type][:total]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick