chartkick 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2deed8ea6acea7a2d4e68d7a0adfb2a396ff685ddd4763a6e7dc7cc9f981b5
-  data.tar.gz: 8c1502d6b8a5b2feda3727c23d0a39e14c1c667b4bc3856f3f106e662490517d
+  metadata.gz: b462bf7fa745700c8fa561b0e5707c309f6f5cca29e314e550921370b3a9d590
+  data.tar.gz: be9169ad2777d6e40846ef058ad981a3366aea965f16aa2e1af44d7c2b81cad4
 SHA512:
-  metadata.gz: 6b662ba0dea0a3c8e116fa6428bc52bd4288a301d20395f9671a3e478199c30278db020043c534f2edd62f0971fb5a7f4fa3608136d23b40103930afa59032d2
-  data.tar.gz: 78d2f5473da5ce6b60a68eea76bb848339f4a77981595d9bc693e6e2fd83f9010f2ce6628570c7d034140e2c1416eda246d85fcae533a7d177d3ab4ef01e8281
+  metadata.gz: 2eedfd5f334b4e875d88b7b5e9af963a8ad3c4f8fc86eb17b31f0fb41e3b357cb3909a27cc92f8018c709856f56a7c0614ec95ac5ab8747549767e1f95fd7de8
+  data.tar.gz: f997c95810273ed9d436f3e307b92b3936fe17736d01adda4979efc90379f45a703d97aeeed3c9a3add187440d0d085c8b3e4635df2dec0720491c9268a80eda

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.3.2 (2020-07-23)
+
+- Updated Chartkick.js to 3.2.1
+
 ## 3.3.1 (2019-12-26)
 
 - Updated Chart.js to 2.9.3

data/README.md

@@ -8,6 +8,8 @@ Create beautiful JavaScript charts with one line of Ruby. No more fighting with
 
 :two_hearts: A perfect companion to [Groupdate](https://github.com/ankane/groupdate), [Hightop](https://github.com/ankane/hightop), and [ActiveMedian](https://github.com/ankane/active_median)
 
+[![Build Status](https://travis-ci.org/ankane/chartkick.svg?branch=master)](https://travis-ci.org/ankane/chartkick)
+
 ## Quick Start
 
 Add this line to your application's Gemfile:
@@ -323,7 +325,7 @@ Then, in your layout, use:
 <%= yield :charts_js %>
 ```
 
-> For Padrino, use `yield_content` instead of `yield`
+For Padrino, use `yield_content` instead of `yield`.
 
 This is great for including all of your JavaScript at the bottom of the page.
 
@@ -370,9 +372,7 @@ If you want to use the charting library directly, get the code with:
 <%= line_chart data, code: true %>
 ```
 
-The code will be logged to the JavaScript console.
-
-> JavaScript functions cannot be logged, so it may not be identical.
+The code will be logged to the JavaScript console. JavaScript functions cannot be logged, so it may not be identical.
 
 ### Download Charts
 
@@ -384,7 +384,7 @@ Give users the ability to download charts. It all happens in the browser - no se
 <%= line_chart data, download: true %>
 ```
 
-> Safari will open the image in a new window instead of downloading.
+Safari will open the image in a new window instead of downloading.
 
 Set the filename
 
@@ -418,7 +418,7 @@ Next, choose your charting library.
 - [Google Charts](#google-charts)
 - [Highcharts](#highcharts)
 
-> In the instructions below, `application.js` must be included **before** the charts in your views, unless using the `:content_for` option.
+In the instructions below, `application.js` must be included **before** the charts in your views, unless using the `:content_for` option.
 
 ### Chart.js
 
@@ -562,6 +562,12 @@ Redraw the chart with:
 chart.redraw()
 ```
 
+Destroy the chart with:
+
+```javascript
+chart.destroy()
+```
+
 Loop over charts with:
 
 ```javascript
@@ -597,14 +603,6 @@ Breaking changes
 - Removed `window.Chartkick = {...}` way to set config - use `Chartkick.configure` instead
 - Removed support for the Google Charts jsapi loader - use loader.js instead
 
-### 2.0
-
-Breaking changes
-
-- Chart.js is now the default adapter if multiple are loaded - yay open source!
-- Axis types are automatically detected - no need for `discrete: true`
-- Better date support - dates are no longer treated as UTC
-
 ## Credits
 
 Chartkick uses [iso8601.js](https://github.com/Do/iso8601.js) to parse dates and times.
@@ -613,8 +611,6 @@ Chartkick uses [iso8601.js](https://github.com/Do/iso8601.js) to parse dates and
 
 View the [changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
 
-Chartkick follows [Semantic Versioning](https://semver.org/)
-
 ## Contributing
 
 Everyone is encouraged to help improve this project. Here are a few ways you can help:
@@ -623,3 +619,12 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Fix bugs and [submit pull requests](https://github.com/ankane/chartkick/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
+
+To get started with development:
+
+```sh
+git clone https://github.com/ankane/chartkick.git
+cd chartkick
+bundle install
+bundle exec rake test
+```

data/lib/chartkick/helper.rb

@@ -85,6 +85,7 @@ module Chartkick
       createjs = "new Chartkick[%{type}](%{id}, %{data}, %{options});" % js_vars
 
       if defer
+        # TODO remove type in 4.0
         js = <<JS
 <script type="text/javascript"#{nonce_html}>
   (function() {
@@ -100,6 +101,7 @@ module Chartkick
 </script>
 JS
       else
+        # TODO remove type in 4.0
         js = <<JS
 <script type="text/javascript"#{nonce_html}>
   #{createjs}

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "3.3.1"
+  VERSION = "3.3.2"
 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.2.0
+ * v3.2.1
  * MIT License
  */
 
@@ -241,6 +241,8 @@
     return typeof obj === "number";
   }
 
+  var byteSuffixes = ["bytes", "KB", "MB", "GB", "TB", "PB", "EB"];
+
   function formatValue(pre, value, options, axis) {
     pre = pre || "";
     if (options.prefix) {
@@ -256,26 +258,42 @@
     var round = options.round;
 
     if (options.byteScale) {
+      var suffixIdx;
       var baseValue = axis ? options.byteScale : value;
-      if (baseValue >= 1099511627776) {
+
+      if (baseValue >= 1152921504606846976) {
+        value /= 1152921504606846976;
+        suffixIdx = 6;
+      } else if (baseValue >= 1125899906842624) {
+        value /= 1125899906842624;
+        suffixIdx = 5;
+      } else if (baseValue >= 1099511627776) {
         value /= 1099511627776;
-        suffix = " TB";
+        suffixIdx = 4;
       } else if (baseValue >= 1073741824) {
         value /= 1073741824;
-        suffix = " GB";
+        suffixIdx = 3;
       } else if (baseValue >= 1048576) {
         value /= 1048576;
-        suffix = " MB";
+        suffixIdx = 2;
       } else if (baseValue >= 1024) {
         value /= 1024;
-        suffix = " KB";
+        suffixIdx = 1;
       } else {
-        suffix = " bytes";
+        suffixIdx = 0;
       }
 
+      // TODO handle manual precision case
       if (precision === undefined && round === undefined) {
-        precision = 3;
+        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) {
@@ -746,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();
@@ -1448,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: {
@@ -1564,7 +1598,7 @@
       if (config.language) {
         loadOptions.language = config.language;
       }
-      if (pack === "corechart" && config.mapsApiKey) {
+      if (pack === "geochart" && config.mapsApiKey) {
         loadOptions.mapsApiKey = config.mapsApiKey;
       }
 
@@ -1576,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);
@@ -1951,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";
@@ -2004,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;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 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

data/CONTRIBUTING.md

@@ -1,46 +0,0 @@
-# Contributing
-
-First, thanks for wanting to contribute. You’re awesome! :heart:
-
-## Help
-
-We’re not able to provide support through GitHub Issues. If you’re looking for help with your code, try posting on [Stack Overflow](https://stackoverflow.com/).
-
-All features should be documented. If you don’t see a feature in the docs, assume it doesn’t exist.
-
-## Bugs
-
-Think you’ve discovered a bug?
-
-1. Search existing issues to see if it’s been reported.
-2. Try the `master` branch to make sure it hasn’t been fixed.
-
-```rb
-gem "chartkick", github: "ankane/chartkick"
-```
-
-If the above steps don’t help, create an issue. Include:
-
-- Detailed steps to reproduce
-- JavaScript rendered by Chartkick
-- Complete backtraces for exceptions
-
-## New Features
-
-If you’d like to discuss a new feature, create an issue and start the title with `[Idea]`.
-
-## Pull Requests
-
-Fork the project and create a pull request. A few tips:
-
-- Submit JavaScript changes to the [Chartkick.js](https://github.com/ankane/chartkick.js) repo.
-- Keep changes to a minimum. If you have multiple features or fixes, submit multiple pull requests.
-- Follow the existing style. The code should read like it’s written by a single person.
-
-Feel free to open an issue to get feedback on your idea before spending too much time on it.
-
-Also, note that we aren’t currently accepting new chart types.
-
----
-
-This contributing guide is released under [CCO](https://creativecommons.org/publicdomain/zero/1.0/) (public domain). Use it for your own project without attribution.