chartkick 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e0d6353831bab9338cb9cf38ab0cb378b77b6d
-  data.tar.gz: e9574fb91b0791e73beb85fb9db099f889a78b44
+  metadata.gz: 7d2cca10828cf50bfef4cf0d276ca3b5f03874c6
+  data.tar.gz: 7dd04885900e535eda3bada4bb9efd91792dab01
 SHA512:
-  metadata.gz: 96a14a4149c41faf2be38058c27767cafb607d997e003b0913c2714387ff6ecf6afa0cbd1fc2fb4757bfc1d9c22d373fbfc727ae66748cf71d2708f4d0eb346f
-  data.tar.gz: b524a6416488595a9310cd0e085b52afd50a0cfc53c4d1d6bb76bccdf73f92c9ab4ed8eda168747274fdd0c7e765b70a96ce5bb684b12d7edb4cd297afc90380
+  metadata.gz: 0481002107a308918f2db7bdb4fa6c2e820ae4d305b497c3e3acde5c51702bc42107b3c6e81e6c188f41c67e7af904d581617b37f8bd6a35605e94297c3e228b
+  data.tar.gz: 7ca0e4af5586b5b30f400452032ce81706775783ddd7414ee54d0fc570a96eac97ac741383d0de0d4ab5a97266b71fcccd4a6c9028900ef96cde4173a80c76a6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.2
+
+- Updated Chartkick.js to 2.0.1
+- Updated Chart.js to 2.2.1
+
 ## 2.0.1
 
 - Small Chartkick.js fixes

data/README.md

@@ -40,7 +40,7 @@ Area chart
 <%= area_chart Visit.group_by_minute(:created_at).maximum(:load_time) %>
 ```
 
-Scatter chart - *Google Charts and Highcharts*
+Scatter chart
 
 ```erb
 <%= scatter_chart City.pluck(:size, :population) %>
@@ -328,6 +328,7 @@ Check out [chartkick.js](https://github.com/ankane/chartkick.js)
 ## Tutorials
 
 - [Make Easy Graphs and Charts on Rails with Chartkick](https://www.sitepoint.com/make-easy-graphs-and-charts-on-rails-with-chartkick/)
+- [Practical Graphs on Rails: Chartkick in Practice](https://www.sitepoint.com/graphs-on-rails-chartkick-in-practice/)
 
 ## Upgrading
 

data/app/assets/javascripts/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful JavaScript charts with minimal code
  * https://github.com/ankane/chartkick.js
- * v2.0.0
+ * v2.0.1
  * MIT License
  */
 
@@ -1109,6 +1109,41 @@
         this.renderBarChart = function (chart) {
           self.renderColumnChart(chart, "bar");
         };
+
+        this.renderScatterChart = function (chart) {
+          var options = jsOptions(chart.data, chart.options);
+
+          var colors = chart.options.colors || defaultColors;
+
+          var datasets = [];
+          var series = chart.data;
+          for (var i = 0; i < series.length; i++) {
+            var s = series[i];
+            var d = [];
+            for (var j = 0; j < s.data.length; j++) {
+              d.push({
+                x: toFloat(s.data[j][0]),
+                y: toFloat(s.data[j][1])
+              });
+            }
+
+            datasets.push({
+              label: s.name,
+              showLine: false,
+              data: d,
+              borderColor: colors[i],
+              backgroundColor: colors[i],
+              pointBackgroundColor: colors[i]
+            })
+          }
+
+          var data = {datasets: datasets};
+
+          options.scales.xAxes[0].type = "linear";
+          options.scales.xAxes[0].position = "bottom";
+
+          drawChart(chart, "line", data, options);
+        };
       };
 
       adapters.unshift(ChartjsAdapter);

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/vendor/assets/javascripts/Chart.bundle.js

@@ -1,7 +1,7 @@
 /*!
  * Chart.js
  * http://chartjs.org/
- * Version: 2.2.0
+ * Version: 2.2.1
  *
  * Copyright 2016 Nick Downie
  * Released under the MIT license
@@ -6775,7 +6775,7 @@ module.exports = function(Chart) {
 							var meta = chart.getDatasetMeta(0);
 							var ds = data.datasets[0];
 							var arc = meta.data[i];
-							var custom = arc.custom || {};
+							var custom = arc && arc.custom || {};
 							var getValueAtIndexOrDefault = helpers.getValueAtIndexOrDefault;
 							var arcOpts = chart.options.elements.arc;
 							var fill = custom.backgroundColor ? custom.backgroundColor : getValueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
@@ -6982,6 +6982,10 @@ module.exports = function(Chart) {
 				}
 			});
 
+			/*if (total === 0) {
+				total = NaN;
+			}*/
+
 			return total;
 		},
 
@@ -12864,7 +12868,7 @@ module.exports = function(Chart) {
 				}
 
 				if (!loop) {
-					ctx.lineTo(points[points.length - 1]._view.x, scaleZero);
+					ctx.lineTo(points[lastDrawnIndex]._view.x, scaleZero);
 				}
 
 				ctx.fillStyle = vm.backgroundColor || globalDefaults.defaultColor;
@@ -12907,7 +12911,7 @@ module.exports = function(Chart) {
 					previous = lastDrawnIndex === -1 ? previous : points[lastDrawnIndex];
 
 					if (!currentVM.skip) {
-						if (lastDrawnIndex !== (index - 1) && !spanGaps) {
+						if ((lastDrawnIndex !== (index - 1) && !spanGaps) || lastDrawnIndex === -1) {
 							// There was a gap and this is the first point after the gap
 							ctx.moveTo(currentVM.x, currentVM.y);
 						} else {
@@ -14428,10 +14432,15 @@ module.exports = function(Chart) {
 			// Only round the last tick if we have no hard maximum
 			if (!me.options.time.max) {
 				var roundedEnd = me.getMomentStartOf(me.lastTick);
-				if (roundedEnd.diff(me.lastTick, me.tickUnit, true) !== 0) {
+				var delta = roundedEnd.diff(me.lastTick, me.tickUnit, true);
+				if (delta < 0) {
 					// Do not use end of because we need me to be in the next time unit
 					me.lastTick = me.getMomentStartOf(me.lastTick.add(1, me.tickUnit));
+				} else if (delta >= 0) {
+					me.lastTick = roundedEnd;
 				}
+
+				me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true);
 			}
 
 			me.smallestLabelSeparation = me.width;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler