chartkick 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c58fc2c0725fcf5226fd394c02d7e7a08eed251
-  data.tar.gz: 4809227124c7b7fa8bb3e1907859e65d7476746c
+  metadata.gz: 9c337ade357df03e6f2696c9a3a0286f680be8a0
+  data.tar.gz: ad699b7126c8453c7940c2856a4fb5b364b40ac7
 SHA512:
-  metadata.gz: a5cfd768e87a01679cb843a18365f226a9e7014ee942606a8cdab144c51b05e315d9be2fab068668aad1a55022ce9d67bad30254dd9e7445da7e0f634a38fb0b
-  data.tar.gz: d7430b45f2d189d6e711cb9eefbf5e4edc4939200bcc0ba3a813aed1da0e24f47436a38c8c8fc64c8c86dc958be4a71c65e823c2a61dd8dc2d23dba7d58fd7c1
+  metadata.gz: 338c912c54d819b763c75b9a4285b8053db75acd4e25d2f92107f43db5fc4adcf6b67594d623018346985c101eec99b9ee14c94d018c66d4a491b1c6273ac819
+  data.tar.gz: 0f860d947e6d76893b6c591392ca3c638e06e061441a89bfc0a017f86dbdb7befc2ccd44208c19de5b68e310e5a2ba4f4ebf931434dab96f234c65700db4dca5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.1
+
+- Updated Chartkick.js to 2.3.1
+
 ## 2.3.0
 
 - Fixed deep merge error for non-Rails apps

data/CONTRIBUTING.md

@@ -21,10 +21,11 @@ Think you’ve discovered an issue?
 gem "chartkick", github: "ankane/chartkick"
 ```
 
-If the above steps don’t help, create an issue.
+If the above steps don’t help, create an issue. Include:
 
-- Include the JavaScript rendered by Chartkick.
-- For exceptions, include the complete backtrace.
+- Detailed steps to reproduce
+- JavaScript rendered by Chartkick
+- Complete backtraces for exceptions
 
 ## Pull Requests
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Andrew Kane
+Copyright (c) 2013-2018 Andrew Kane
 
 MIT License
 

data/README.md

@@ -224,7 +224,7 @@ You can pass options directly to the charting library with:
 <%= line_chart data, library: {backgroundColor: "#eee"} %>
 ```
 
-See the documentation for [Chart.js](http://www.chartjs.org/docs/), [Google Charts](https://developers.google.com/chart/interactive/docs/gallery), and [Highcharts](http://api.highcharts.com/highcharts) for more info.
+See the documentation for [Chart.js](http://www.chartjs.org/docs/), [Google Charts](https://developers.google.com/chart/interactive/docs/gallery), and [Highcharts](https://api.highcharts.com/highcharts) for more info.
 
 ### Global Options
 
@@ -310,7 +310,9 @@ gem "chartkick"
 
 Next, choose your charting library.
 
-**Note:** In the instructions below, `application.js` must be included **before** the helper methods in your views, unless using the `:content_for` option.
+### Charting Libraries
+
+**Note:** In the instructions below, `application.js` must be included **before** the charts in your views, unless using the `:content_for` option.
 
 #### Chart.js
 
@@ -337,7 +339,7 @@ In your views, before `application.js`, add:
 
 #### Highcharts
 
-Download [highcharts.js](https://code.highcharts.com/highcharts.js) into `vendor/assets/javascripts`.
+Download [highcharts.js](https://code.highcharts.com/highcharts.js) into `vendor/assets/javascripts` (or use `yarn add highcharts` in Rails 5.1+).
 
 In `application.js`, add:
 
@@ -348,6 +350,35 @@ In `application.js`, add:
 
 Works with Highcharts 2.1+
 
+### Webpacker
+
+For Webpacker, use Yarn to install the JavaScript libraries:
+
+```sh
+yarn add chartkick
+yarn add chart.js # or highcharts
+```
+
+Then include them in your pack.
+
+```es6
+import Chartkick from "chartkick";
+window.Chartkick = Chartkick;
+
+// for Chart.js
+import Chart from "chart.js";
+window.Chart = Chart;
+
+// for Highcharts
+import Highcharts from "highcharts";
+window.Highcharts = Highcharts;
+
+// for Google Charts
+// just include https://www.gstatic.com/charts/loader.js in your views
+```
+
+You pack must be included **before** the charts in your views, unless using the `:content_for` option.
+
 ### Sinatra and Padrino
 
 You must include `chartkick.js` manually. [Download it here](https://raw.githubusercontent.com/ankane/chartkick/master/vendor/assets/javascripts/chartkick.js)
@@ -459,7 +490,7 @@ 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](http://semver.org/)
+Chartkick follows [Semantic Versioning](https://semver.org/)
 
 ## Contributing
 

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end