chartkick 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad30daf6a29dc9c07b5f6f7df88224d459bbcf285474178871beb146995856d8
-  data.tar.gz: 24404117c464a9b34d85d33a5961185b7ef519dfb70ad53cb921555a0fc2769c
+  metadata.gz: 4095d5927227369af302a38b18031a3e92ff04e8f9c75d2b9ee9d52ab5532457
+  data.tar.gz: 3441a58be2bfdca1073ca9595a51e25b7b801e8003690d97146d5c9208bde633
 SHA512:
-  metadata.gz: 888b38d483647415c0be6a1201e47110989274c592c1456bda39e2c5be558155c17d78218c55848b86c4249677763d65e48ac500aa1f9542b9a329dedc81a995
-  data.tar.gz: e4caaf76d598629d0aad188718a1b0cc4dbe8b5cbe0257d2b727d3736eaca6ba9e000f83c1ae75469ca5dba34aebe8e3f538b74c7968bddc97a2d938b188bd2e
+  metadata.gz: 2d19a25abd114e54310aa2828328d0ed1d6ce19f1a6a5c7185a1e647eaefdfb6c3ddabd216a4e8726613beaa0a945f97d56c946cc074823376b2cffd3525d28c
+  data.tar.gz: 38ffd924959c50e7849cb6cb32297b081c376c2695499913737212e7e6c2172ff646d24719b2eb27b3f8ad2984acbd7154e859378ed5375963f19f0444f90f9e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.1
+
+- Updated Chartkick.js to 3.0.1
+
 ## 3.0.0
 
 - Updated Chartkick.js to 3.0.0

data/README.md

@@ -2,7 +2,7 @@
 
 Create beautiful JavaScript charts with one line of Ruby. No more fighting with charting libraries!
 
-[See it in action](https://www.chartkick.com)
+[See it in action](https://chartkick.com)
 
 :fire: For admin charts and dashboards, check out [Blazer](https://github.com/ankane/blazer/)
 
@@ -300,6 +300,8 @@ If you want to use the charting library directly, get the code with:
 
 The code will be logged to the JavaScript console.
 
+**Note:** JavaScript functions cannot be logged, so it may not be identical.
+
 ### Download Charts
 
 *Chart.js only*

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

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.0.0
+ * v3.0.1
  * MIT License
  */
 
@@ -501,25 +501,7 @@
 
     var i, j, s, d, key, rows = [], rows2 = [];
 
-    if (chart.xtype === "number" || chartType === "bubble") {
-      for (var i$2 = 0; i$2 < series.length; i$2++) {
-        var s$2 = series[i$2];
-        var d$1 = [];
-        for (var j$2 = 0; j$2 < s$2.data.length; j$2++) {
-          var point = {
-            x: toFloat(s$2.data[j$2][0]),
-            y: toFloat(s$2.data[j$2][1])
-          };
-          if (chartType === "bubble") {
-            point.r = toFloat(s$2.data[j$2][2]) * 20 / max;
-            // custom attribute, for tooltip
-            point.v = s$2.data[j$2][2];
-          }
-          d$1.push(point);
-        }
-        rows2.push(d$1);
-      }
-    } else {
+    if (chartType === "bar" || chartType === "column" || (chart.xtype !== "number" && chart.xtype !== "bubble")) {
       var sortedLabels = [];
 
       for (i = 0; i < series.length; i++) {
@@ -538,7 +520,7 @@
         }
       }
 
-      if (chart.xtype === "datetime") {
+      if (chart.xtype === "datetime" || chart.xtype === "number") {
         sortedLabels.sort(sortByNumber);
       }
 
@@ -571,6 +553,24 @@
           rows2[j].push(rows[i][j] === undefined ? null : rows[i][j]);
         }
       }
+    } else {
+      for (var i$2 = 0; i$2 < series.length; i$2++) {
+        var s$2 = series[i$2];
+        var d$1 = [];
+        for (var j$2 = 0; j$2 < s$2.data.length; j$2++) {
+          var point = {
+            x: toFloat(s$2.data[j$2][0]),
+            y: toFloat(s$2.data[j$2][1])
+          };
+          if (chartType === "bubble") {
+            point.r = toFloat(s$2.data[j$2][2]) * 20 / max;
+            // custom attribute, for tooltip
+            point.v = s$2.data[j$2][2];
+          }
+          d$1.push(point);
+        }
+        rows2.push(d$1);
+      }
     }
 
     for (i = 0; i < series.length; i++) {
@@ -580,7 +580,7 @@
       var backgroundColor = chartType !== "line" ? addOpacity(color, 0.5) : color;
 
       var dataset = {
-        label: s.name,
+        label: s.name || "",
         data: rows2[i],
         fill: chartType === "area",
         borderColor: color,
@@ -590,10 +590,6 @@
         pointHoverBackgroundColor: color
       };
 
-      if (chartType === "scatter" || chartType === "bubble") {
-        dataset.showLine = false;
-      }
-
       if (s.stack) {
         dataset.stack = s.stack;
       }
@@ -695,7 +691,12 @@
 
     var data = createDataTable(chart, options, chartType || "line");
 
-    options.scales.xAxes[0].type = chart.xtype === "string" ? "category" : (chart.xtype == "number" ? "linear" : "time");
+    if (chart.xtype === "number") {
+      options.scales.xAxes[0].type = "linear";
+      options.scales.xAxes[0].position = "bottom";
+    } else {
+      options.scales.xAxes[0].type = chart.xtype === "string" ? "category" : "time";
+    }
 
     this.drawChart(chart, "line", data, options);
   };
@@ -768,6 +769,10 @@
     var options = jsOptions(chart, chart.options);
     setFormatOptions(chart, options, chartType);
 
+    if (!("showLines" in options)) {
+      options.showLines = false;
+    }
+
     var data = createDataTable(chart, options, chartType);
 
     options.scales.xAxes[0].type = "linear";

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler