chartkick 3.2.0 → 3.3.2

data/vendor/assets/javascripts/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful charts with one line of JavaScript
  * https://github.com/ankane/chartkick.js
- * v3.1.0
+ * v3.2.1
  * MIT License
  */
 
@@ -10,7 +10,7 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
   (global = global || self, global.Chartkick = factory());
-}(this, function () { 'use strict';
+}(this, (function () { 'use strict';
 
   function isArray(variable) {
     return Object.prototype.toString.call(variable) === "[object Array]";
@@ -21,13 +21,17 @@
   }
 
   function isPlainObject(variable) {
-    return Object.prototype.toString.call(variable) === "[object Object]";
+    // protect against prototype pollution, defense 2
+    return Object.prototype.toString.call(variable) === "[object Object]" && !isFunction(variable) && variable instanceof Object;
   }
 
   // https://github.com/madrobby/zepto/blob/master/src/zepto.js
   function extend(target, source) {
     var key;
     for (key in source) {
+      // protect against prototype pollution, defense 1
+      if (key === "__proto__") { continue; }
+
       if (isPlainObject(source[key]) || isArray(source[key])) {
         if (isPlainObject(source[key]) && !isPlainObject(target[key])) {
           target[key] = {};
@@ -237,7 +241,9 @@
     return typeof obj === "number";
   }
 
-  function formatValue(pre, value, options) {
+  var byteSuffixes = ["bytes", "KB", "MB", "GB", "TB", "PB", "EB"];
+
+  function formatValue(pre, value, options, axis) {
     pre = pre || "";
     if (options.prefix) {
       if (value < 0) {
@@ -247,6 +253,74 @@
       pre += options.prefix;
     }
 
+    var suffix = options.suffix || "";
+    var precision = options.precision;
+    var round = options.round;
+
+    if (options.byteScale) {
+      var suffixIdx;
+      var baseValue = axis ? options.byteScale : value;
+
+      if (baseValue >= 1152921504606846976) {
+        value /= 1152921504606846976;
+        suffixIdx = 6;
+      } else if (baseValue >= 1125899906842624) {
+        value /= 1125899906842624;
+        suffixIdx = 5;
+      } else if (baseValue >= 1099511627776) {
+        value /= 1099511627776;
+        suffixIdx = 4;
+      } else if (baseValue >= 1073741824) {
+        value /= 1073741824;
+        suffixIdx = 3;
+      } else if (baseValue >= 1048576) {
+        value /= 1048576;
+        suffixIdx = 2;
+      } else if (baseValue >= 1024) {
+        value /= 1024;
+        suffixIdx = 1;
+      } else {
+        suffixIdx = 0;
+      }
+
+      // TODO handle manual precision case
+      if (precision === undefined && round === undefined) {
+        if (value >= 1023.5) {
+          if (suffixIdx < byteSuffixes.length - 1) {
+            value = 1.0;
+            suffixIdx += 1;
+          }
+        }
+        precision = value >= 1000 ? 4 : 3;
+      }
+      suffix = " " + byteSuffixes[suffixIdx];
+    }
+
+    if (precision !== undefined && round !== undefined) {
+      throw Error("Use either round or precision, not both");
+    }
+
+    if (!axis) {
+      if (precision !== undefined) {
+        value = value.toPrecision(precision);
+        if (!options.zeros) {
+          value = parseFloat(value);
+        }
+      }
+
+      if (round !== undefined) {
+        if (round < 0) {
+          var num = Math.pow(10, -1 * round);
+          value = parseInt((1.0 * value / num).toFixed(0)) * num;
+        } else {
+          value = value.toFixed(round);
+          if (!options.zeros) {
+            value = parseFloat(value);
+          }
+        }
+      }
+    }
+
     if (options.thousands || options.decimal) {
       value = toStr(value);
       var parts = value.split(".");
@@ -259,7 +333,7 @@
       }
     }
 
-    return pre + value + (options.suffix || "");
+    return pre + value + suffix;
   }
 
   function seriesOption(chart, series, option) {
@@ -420,18 +494,58 @@
       prefix: chart.options.prefix,
       suffix: chart.options.suffix,
       thousands: chart.options.thousands,
-      decimal: chart.options.decimal
+      decimal: chart.options.decimal,
+      precision: chart.options.precision,
+      round: chart.options.round,
+      zeros: chart.options.zeros
     };
 
+    if (chart.options.bytes) {
+      var series = chart.data;
+      if (chartType === "pie") {
+        series = [{data: series}];
+      }
+
+      // calculate max
+      var max = 0;
+      for (var i = 0; i < series.length; i++) {
+        var s = series[i];
+        for (var j = 0; j < s.data.length; j++) {
+          if (s.data[j][1] > max) {
+            max = s.data[j][1];
+          }
+        }
+      }
+
+      // calculate scale
+      var scale = 1;
+      while (max >= 1024) {
+        scale *= 1024;
+        max /= 1024;
+      }
+
+      // set step size
+      formatOptions.byteScale = scale;
+    }
+
     if (chartType !== "pie") {
       var myAxes = options.scales.yAxes;
       if (chartType === "bar") {
         myAxes = options.scales.xAxes;
       }
 
+      if (formatOptions.byteScale) {
+        if (!myAxes[0].ticks.stepSize) {
+          myAxes[0].ticks.stepSize = formatOptions.byteScale / 2;
+        }
+        if (!myAxes[0].ticks.maxTicksLimit) {
+          myAxes[0].ticks.maxTicksLimit = 4;
+        }
+      }
+
       if (!myAxes[0].ticks.callback) {
         myAxes[0].ticks.callback = function (value) {
-          return formatValue("", value, formatOptions);
+          return formatValue("", value, formatOptions, true);
         };
       }
     }
@@ -486,7 +600,7 @@
 
   var jsOptions = jsOptionsFunc(merge(baseOptions, defaultOptions), hideLegend, setTitle, setMin, setMax, setStacked, setXtitle, setYtitle);
 
-  var createDataTable = function (chart, options, chartType) {
+  var createDataTable = function (chart, options, chartType, library) {
     var datasets = [];
     var labels = [];
 
@@ -631,11 +745,15 @@
     var xmax = chart.options.xmax;
 
     if (chart.xtype === "datetime") {
+      // hacky check for Chart.js >= 2.9.0
+      // https://github.com/chartjs/Chart.js/compare/v2.8.0...v2.9.0
+      var gte29 = "math" in library.helpers;
+      var ticksKey = gte29 ? "ticks" : "time";
       if (notnull(xmin)) {
-        options.scales.xAxes[0].time.min = toDate(xmin).getTime();
+        options.scales.xAxes[0][ticksKey].min = toDate(xmin).getTime();
       }
       if (notnull(xmax)) {
-        options.scales.xAxes[0].time.max = toDate(xmax).getTime();
+        options.scales.xAxes[0][ticksKey].max = toDate(xmax).getTime();
       }
     } else if (chart.xtype === "number") {
       if (notnull(xmin)) {
@@ -646,6 +764,22 @@
       }
     }
 
+    // for empty datetime chart
+    if (chart.xtype === "datetime" && labels.length === 0) {
+      if (notnull(xmin)) {
+        labels.push(toDate(xmin));
+      }
+      if (notnull(xmax)) {
+        labels.push(toDate(xmax));
+      }
+      day = false;
+      week = false;
+      month = false;
+      year = false;
+      hour = false;
+      minute = false;
+    }
+
     if (chart.xtype === "datetime" && labels.length > 0) {
       var minTime = (notnull(xmin) ? toDate(xmin) : labels[0]).getTime();
       var maxTime = (notnull(xmax) ? toDate(xmax) : labels[0]).getTime();
@@ -726,7 +860,7 @@
     var options = jsOptions(chart, merge(chartOptions, chart.options));
     setFormatOptions(chart, options, chartType);
 
-    var data = createDataTable(chart, options, chartType || "line");
+    var data = createDataTable(chart, options, chartType || "line", this.library);
 
     if (chart.xtype === "number") {
       options.scales.xAxes[0].type = "linear";
@@ -780,12 +914,14 @@
   defaultExport.prototype.renderColumnChart = function renderColumnChart (chart, chartType) {
     var options;
     if (chartType === "bar") {
-      options = jsOptionsFunc(merge(baseOptions, defaultOptions), hideLegend, setTitle, setBarMin, setBarMax, setStacked, setXtitle, setYtitle)(chart, chart.options);
+      var barOptions = merge(baseOptions, defaultOptions);
+      delete barOptions.scales.yAxes[0].ticks.maxTicksLimit;
+      options = jsOptionsFunc(barOptions, hideLegend, setTitle, setBarMin, setBarMax, setStacked, setXtitle, setYtitle)(chart, chart.options);
     } else {
       options = jsOptions(chart, chart.options);
     }
     setFormatOptions(chart, options, chartType);
-    var data = createDataTable(chart, options, "column");
+    var data = createDataTable(chart, options, "column", this.library);
     if (chartType !== "bar") {
       setLabelSize(chart, data, options);
     }
@@ -810,7 +946,7 @@
       options.showLines = false;
     }
 
-    var data = createDataTable(chart, options, chartType);
+    var data = createDataTable(chart, options, chartType, this.library);
 
     options.scales.xAxes[0].type = "linear";
     options.scales.xAxes[0].position = "bottom";
@@ -884,6 +1020,7 @@
     },
     plotOptions: {
       areaspline: {},
+      area: {},
       series: {
         marker: {}
       }
@@ -920,7 +1057,10 @@
   };
 
   var setStacked$1 = function (options, stacked) {
-    options.plotOptions.series.stacking = stacked ? (stacked === true ? "normal" : stacked) : null;
+    var stackedValue = stacked ? (stacked === true ? "normal" : stacked) : null;
+    options.plotOptions.series.stacking = stackedValue;
+    options.plotOptions.area.stacking = stackedValue;
+    options.plotOptions.areaspline.stacking = stackedValue;
   };
 
   var setXtitle$1 = function (options, title) {
@@ -938,7 +1078,10 @@
       prefix: chart.options.prefix,
       suffix: chart.options.suffix,
       thousands: chart.options.thousands,
-      decimal: chart.options.decimal
+      decimal: chart.options.decimal,
+      precision: chart.options.precision,
+      round: chart.options.round,
+      zeros: chart.options.zeros
     };
 
     if (chartType !== "pie" && !options.yAxis.labels.formatter) {
@@ -1339,7 +1482,7 @@
   defaultExport$2.prototype.renderGeoChart = function renderGeoChart (chart) {
       var this$1 = this;
 
-    this.waitForLoaded(chart, function () {
+    this.waitForLoaded(chart, "geochart", function () {
       var chartOptions = {
         legend: "none",
         colorAxis: {
@@ -1455,7 +1598,7 @@
       if (config.language) {
         loadOptions.language = config.language;
       }
-      if (pack === "corechart" && config.mapsApiKey) {
+      if (pack === "geochart" && config.mapsApiKey) {
         loadOptions.mapsApiKey = config.mapsApiKey;
       }
 
@@ -1467,7 +1610,7 @@
     var cb, call;
     for (var i = 0; i < callbacks.length; i++) {
       cb = callbacks[i];
-      call = this.library.visualization && ((cb.pack === "corechart" && this.library.visualization.LineChart) || (cb.pack === "timeline" && this.library.visualization.Timeline));
+      call = this.library.visualization && ((cb.pack === "corechart" && this.library.visualization.LineChart) || (cb.pack === "timeline" && this.library.visualization.Timeline) || (cb.pack === "geochart" && this.library.visualization.GeoChart));
       if (call) {
         cb.callback();
         callbacks.splice(i, 1);
@@ -1566,7 +1709,7 @@
   function ajaxCall(url, success, error) {
     var $ = window.jQuery || window.Zepto || window.$;
 
-    if ($) {
+    if ($ && $.ajax) {
       $.ajax({
         dataType: "json",
         url: url,
@@ -1603,8 +1746,12 @@
     }
   }
 
-  function chartError(element, message) {
-    setText(element, "Error Loading Chart: " + message);
+  // TODO remove prefix for all messages
+  function chartError(element, message, noPrefix) {
+    if (!noPrefix) {
+      message = "Error Loading Chart: " + message;
+    }
+    setText(element, message);
     element.style.color = "#ff0000";
   }
 
@@ -1625,6 +1772,17 @@
       }, function (message) {
         chartError(chart.element, message);
       });
+    } else if (typeof dataSource === "function") {
+      try {
+        dataSource(function (data) {
+          chart.rawData = data;
+          errorCatcher(chart);
+        }, function (message) {
+          chartError(chart.element, message, true);
+        });
+      } catch (err) {
+        chartError(chart.element, err, true);
+      }
     } else {
       chart.rawData = dataSource;
       errorCatcher(chart);
@@ -1827,8 +1985,14 @@
     return r;
   };
 
-  function detectXType(series, noDatetime) {
-    if (detectXTypeWithFunction(series, isNumber)) {
+  function detectXType(series, noDatetime, options) {
+    if (dataEmpty(series)) {
+      if ((options.xmin || options.xmax) && (!options.xmin || isDate(options.xmin)) && (!options.xmax || isDate(options.xmax))) {
+        return "datetime";
+      } else {
+        return "number";
+      }
+    } else if (detectXTypeWithFunction(series, isNumber)) {
       return "number";
     } else if (!noDatetime && detectXTypeWithFunction(series, isDate)) {
       return "datetime";
@@ -1880,12 +2044,18 @@
       chart.hideLegend = false;
     }
 
-    chart.xtype = keyType ? keyType : (opts.discrete ? "string" : detectXType(series, noDatetime));
+    // convert to array
+    // must come before dataEmpty check
+    series = copySeries(series);
+    for (i = 0; i < series.length; i++) {
+      series[i].data = toArr(series[i].data);
+    }
+
+    chart.xtype = keyType ? keyType : (opts.discrete ? "string" : detectXType(series, noDatetime, opts));
 
     // right format
-    series = copySeries(series);
     for (i = 0; i < series.length; i++) {
-      series[i].data = formatSeriesData(toArr(series[i].data), chart.xtype);
+      series[i].data = formatSeriesData(series[i].data, chart.xtype);
     }
 
     return series;
@@ -1970,6 +2140,8 @@
       var sep = this.dataSource.indexOf("?") === -1 ? "?" : "&";
       var url = this.dataSource + sep + "_=" + (new Date()).getTime();
       fetchDataSource(this, url);
+    } else if (typeof this.dataSource === "function") {
+      fetchDataSource(this, this.dataSource);
     }
   };
 
@@ -1978,8 +2150,8 @@
 
     var refresh = this.options.refresh;
 
-    if (refresh && typeof this.dataSource !== "string") {
-      throw new Error("Data source must be a URL for refresh");
+    if (refresh && typeof this.dataSource !== "string" && typeof this.dataSource !== "function") {
+      throw new Error("Data source must be a URL or callback for refresh");
     }
 
     if (!this.intervalId) {
@@ -2289,4 +2461,4 @@
 
   return Chartkick;
 
-}));
+})));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,7 +59,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- CONTRIBUTING.md
 - LICENSE.txt
 - README.md
 - lib/chartkick.rb
@@ -88,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Create beautiful JavaScript charts with one line of Ruby