chartkick 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d125397684b6a65e9e3982dab00818b1387be38099f45ab340c0d6d78c8911
-  data.tar.gz: 9465bd9225d1e97ade176c1769d4ed84664a6a069a0e181d0e8e271505711be0
+  metadata.gz: f2d2a4efa99cc9de5d1f4bafd419ebc3d56f25fd9ff58abcf6ae4a3bbad8751f
+  data.tar.gz: c2c6ce648f0d0bde544ef4a7191396ba499a2bdb9b4d8892a63c19a96152f083
 SHA512:
-  metadata.gz: 514165df39581c34f1d6e929cf679475c929b36e9f47fdc9cdb7d415364833ba6bd1134bc272a364f1c11731c3cee68f48a7e0598e6394e95c1c2e0607c58e91
-  data.tar.gz: 83eec680a359d68461c4258f98cb5f99f387624ae9c7f222f49592f5fc19b2ead5ee83aa69ff5db8a3e58408f2a9bb9887de9059cb91b9dad556c334f8ecebcf
+  metadata.gz: 3ddd0b4c49fc2f761937a884440ce3500442f5ff998650a45723371315813f253d9f49f8f2833821f2d550fa879a09d533ca807e5a1bc69bfb552c3aff91f0b7
+  data.tar.gz: 38ee5f44d26d5d3b17aa84272493f4fcb4c39eb6ec581813fc30364398db5ab08b85b79fd2320b2bfdb885f3a2880c9b7639f9b27f478ae00da2f82f385586ce

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 4.2.0 (2022-06-12)
+
+- Updated Chartkick.js to 4.2.0
+- Updated Chart.js to 3.8.0
+
+## 4.1.3 (2022-01-15)
+
+- Support for `importmap-rails` is no longer experimental
+- Updated Chart.js to 3.7.0
+- Fixed asset precompilation error with `importmap-rails`
+
+## 4.1.2 (2021-11-06)
+
+- Removed automatic pinning for `importmap-rails` (still experimental)
+
 ## 4.1.1 (2021-11-06)
 
 - Updated Chartkick.js to 4.1.1

data/README.md

@@ -4,8 +4,6 @@ Create beautiful JavaScript charts with one line of Ruby. No more fighting with
 
 [See it in action](https://chartkick.com)
 
-**Chartkick 4.0 was recently released** - see [how to upgrade](#upgrading)
-
 :fire: For admin charts and dashboards, check out [Blazer](https://github.com/ankane/blazer/), and for advanced visualizations, check out [Vega](https://github.com/ankane/vega)
 
 :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)
@@ -20,33 +18,67 @@ Add this line to your application’s Gemfile:
 gem "chartkick"
 ```
 
-For Rails 6 / Webpacker, run:
+Then follow the instructions for your framework:
+
+- [Rails 7 / Importmap](#rails-7--importmap)
+- [Rails 7 / esbuild or Webpack](#rails-7--esbuild-or-webpack)
+- [Rails 6 / Webpacker](#rails-6--webpacker)
+- [Rails 5 / Sprockets](#rails-5--sprockets)
+
+This sets up Chartkick with [Chart.js](https://www.chartjs.org/). For other charting libraries and frameworks, see [detailed instructions](#installation).
+
+### Rails 7 / Importmap
+
+In `config/importmap.rb`, add:
+
+```ruby
+pin "chartkick", to: "chartkick.js"
+pin "Chart.bundle", to: "Chart.bundle.js"
+```
+
+And in `app/javascript/application.js`, add:
+
+```js
+import "chartkick"
+import "Chart.bundle"
+```
+
+### Rails 7 / esbuild or Webpack
+
+Run:
 
 ```sh
 yarn add chartkick chart.js
 ```
 
-And in `app/javascript/packs/application.js`, add:
+And in `app/javascript/application.js`, add:
 
 ```js
 import "chartkick/chart.js"
 ```
 
-For Rails 5 / Sprockets, in `app/assets/javascripts/application.js`, add:
+### Rails 6 / Webpacker
 
-```js
-//= require chartkick
-//= require Chart.bundle
+Run:
+
+```sh
+yarn add chartkick chart.js
 ```
 
-For Rails 7 / Importmap (experimental), in `app/javascript/application.js`, add:
+And in `app/javascript/packs/application.js`, add:
 
 ```js
-import "chartkick"
-import "Chart.bundle"
+import "chartkick/chart.js"
 ```
 
-This sets up Chartkick with [Chart.js](https://www.chartjs.org/). For other charting libraries, see [detailed instructions](#installation).
+### Rails 5 / Sprockets
+
+In `app/assets/javascripts/application.js`, add:
+
+```js
+//= require chartkick
+//= require Chart.bundle
+```
 
 ## Charts
 
@@ -421,6 +453,20 @@ Next, choose your charting library.
 
 ### Chart.js
 
+For Rails 7 / Importmap, in `config/importmap.rb`, add:
+
+```ruby
+pin "chartkick", to: "chartkick.js"
+pin "Chart.bundle", to: "Chart.bundle.js"
+```
+
+And in `app/javascript/application.js`, add:
+
+```js
+import "chartkick"
+import "Chart.bundle"
+```
+
 For Rails 6 / Webpacker, run:
 
 ```sh
@@ -440,13 +486,6 @@ For Rails 5 / Sprockets, in `app/assets/javascripts/application.js`, add:
 //= require Chart.bundle
 ```
 
-For Rails 7 / Importmap (experimental), in `app/javascript/application.js`, add:
-
-```js
-import "chartkick"
-import "Chart.bundle"
-```
-
 ### Google Charts
 
 In your layout or views, add:
@@ -455,6 +494,18 @@ In your layout or views, add:
 <%= javascript_include_tag "https://www.gstatic.com/charts/loader.js" %>
 ```
 
+For Rails 7 / Importmap, in `config/importmap.rb`, add:
+
+```ruby
+pin "chartkick", to: "chartkick.js"
+```
+
+And in `app/javascript/application.js`, add:
+
+```js
+import "chartkick"
+```
+
 For Rails 6 / Webpacker, run:
 
 ```sh
@@ -473,12 +524,6 @@ For Rails 5 / Sprockets, in `app/assets/javascripts/application.js`, add:
 //= require chartkick
 ```
 
-For Rails 7 / Importmap (experimental), in `app/javascript/application.js`, add:
-
-```js
-import "chartkick"
-```
-
 To specify a language or Google Maps API key, use:
 
 ```js
@@ -489,38 +534,44 @@ before your charts.
 
 ### Highcharts
 
-For Rails 6 / Webpacker, run:
+For Rails 7 / Importmap, run:
 
 ```sh
-yarn add chartkick highcharts
+bin/importmap pin highcharts --download
 ```
 
-And in `app/javascript/packs/application.js`, add:
+And in `config/importmap.rb`, add:
 
-```js
-import "chartkick/highcharts"
+```ruby
+pin "chartkick", to: "chartkick.js"
 ```
 
-For Rails 5 / Sprockets, download [highcharts.js](https://code.highcharts.com/highcharts.js) into `vendor/assets/javascripts` (or use `yarn add highcharts` in Rails 5.1+), and in `app/assets/javascripts/application.js`, add:
+And in `app/javascript/application.js`, add:
 
 ```js
-//= require chartkick
-//= require highcharts
+import "chartkick"
+import Highcharts from "highcharts"
+
+window.Highcharts = Highcharts
 ```
 
-For Rails 7 / Importmap (experimental), run:
+For Rails 6 / Webpacker, run:
 
 ```sh
-bin/importmap pin highcharts --download
+yarn add chartkick highcharts
 ```
 
-And in `app/javascript/application.js`, add:
+And in `app/javascript/packs/application.js`, add:
 
 ```js
-import "chartkick"
-import Highcharts from "highcharts"
+import "chartkick/highcharts"
+```
 
-window.Highcharts = Highcharts
+For Rails 5 / Sprockets, download [highcharts.js](https://code.highcharts.com/highcharts.js) into `vendor/assets/javascripts` (or use `yarn add highcharts` in Rails 5.1+), and in `app/assets/javascripts/application.js`, add:
+
+```js
+//= require chartkick
+//= require highcharts
 ```
 
 ### Sinatra and Padrino

data/lib/chartkick/engine.rb

@@ -3,9 +3,8 @@ module Chartkick
     # for assets
 
     # for importmap
-    if defined?(Importmap)
-      initializer "chartkick.importmap", after: "importmap" do |app|
-        app.importmap.draw(Engine.root.join("config/importmap.rb"))
+    initializer "chartkick.importmap" do |app|
+      if defined?(Importmap)
         app.config.assets.precompile << "chartkick.js"
         app.config.assets.precompile << "Chart.bundle.js"
       end

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "4.1.1"
+  VERSION = "4.2.0"
 end

data/licenses/LICENSE-chart.js.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2021 Chart.js Contributors
+Copyright (c) 2014-2022 Chart.js Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: