chartjs-ror 3.6.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a737cc8f5931d28d8d508f18072574ceae31f0177c8de8fb399384986a0c9326
-  data.tar.gz: 13094dd3d2f056fc4b93405988354c593c8aa9446ff9cc1d18f17426113ec2b0
+  metadata.gz: 700db71e8b8ad9159314dce41e15bca80e0b0ac841eef90cfc68f00c546b117c
+  data.tar.gz: 88703af95b762dbc22364c17c302a032b7c3af8be761c2f5bd0f24108ad068e2
 SHA512:
-  metadata.gz: 65047ef07ad53bdcc3c05103869557949a2224b8073889a3a33cf177b390f6268c86e641f2588fdd9cdfe0645a4e7e42a7e26b5476e96821ade58d90dd4e5a61
-  data.tar.gz: 84640ff0ee43a5ade63c6b5c784be122009f24b8e578e5664bdd499b89a1f3af4561516d309ea5b093396675748fc08649d3f3cc6708d909d586ca60241f8fed
+  metadata.gz: b1534723e0409ffce450d9e21ff17cc00dd07bc74d7f2ff8a2521b7fdbecd30b4d54cea381f6d051a3cb9dfe5726827e6f7636aade16f6ead4bab0d7fd6182ff
+  data.tar.gz: 8bc30bf56d6c1bd201f9e5fa2135f674f3bd0355fe59f04b413ec31323383a0378fbaa058f9f37a4bde18456c8cc9f18f6de68e5ba8260256203433eaa3adcce

data/{CHANGELOG → CHANGELOG.md}

@@ -1,7 +1,47 @@
 # CHANGELOG
 
+## 3.7.0 - 2022-04-08
 
-## Unreleased
+- Use Chart.js v3.7.1.
+
+## 3.6.5 - 2021-11-19
+
+- Use Chart.js v3.6.0.
+
+
+## 3.6.4 - 2019-02-27
+
+- Add argument for plugins.
+
+
+## 3.6.3 - 2019-02-14
+
+- Use Chart.js v2.7.3.
+- Add CSP nonce to inline JavaScript.
+- Do not modify options.
+
+
+## 3.6.2 - 2018-03-14
+
+- Use Chart.js v2.7.2.
+
+
+## 3.6.1 - 2018-03-14
+
+- Use Chart.js v2.7.1.
+
+
+## 3.6.0 - 2018-03-14
+
+- Use Chart.js v2.7.0.
+
+
+## 3.5.0 - 2018-03-14
+
+- Use Chart.js v2.6.0.
+
+
+## 3.4.0 - 2018-03-14
 
 - Use Chart.js v2.5.0.
 

data/README.md

@@ -5,7 +5,7 @@ Simplifies using [Chart.js][] in Rails views.
 
 ## Current Chart.js version
 
-This gem includes [Chart.js v2.7.2](https://github.com/chartjs/Chart.js/tree/v2.7.2).
+This gem includes [Chart.js v3.7.1](https://github.com/chartjs/Chart.js/tree/v3.7.1).
 
 
 ## Installation
@@ -18,20 +18,12 @@ And then execute:
 
     $ bundle
 
-There are two builds of Chart.js: with or without Moment.js.
+After that require Chart:
 
-Choose the appropriate one in your javascript manifest:
-
-- Without Moment.js:
   ```javascript
   //= require Chart.min
   ```
 
-- With Moment.js:
-  ```javascript
-  //= require Chart.bundle.min
-  ```
-
 Please note Chart.js [no longer supports IE8 and below](https://github.com/chartjs/Chart.js/issues/2396#issuecomment-215233106).
 
 
@@ -170,7 +162,7 @@ You can also use these non-Chart.js settings:
   //<![CDATA[
   (function() {
     var initChart = function() {
-      var ctx = document.getElemenyById("chart-0");
+      var ctx = document.getElementById("chart-0");
       var chart = new Chart(ctx, {
         type: "Line",
         data = { ... };

data/chartjs-ror.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = 'Simplifies using Chart.js in Rails'
   gem.summary       = 'Simplifies using Chart.js in Rails'
   gem.homepage      = 'https://github.com/airblade/chartjs-ror'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/chartjs/chart_helpers.rb

@@ -8,34 +8,36 @@ module Chartjs
 
     module Explicit
       CHART_TYPES.each do |type|
-        define_method "chartjs_#{type}_chart" do |data, options = {}|    # def chartjs_polar_area_chart(data, options = {})
-          chart type, data, options                                      #   chart 'polar_area', data, options
-        end                                                              # end
+        define_method "chartjs_#{type}_chart" do |data, options = {}, plugins = {}|    # def chartjs_polar_area_chart(data, options = {}, plugins = {})
+          chart type, data, options, plugins                                           #   chart 'polar_area', data, options, plugins
+        end                                                                            # end
       end
       include Chartjs::ChartHelpers
     end
 
     module Implicit
       CHART_TYPES.each do |type|
-        define_method "#{type}_chart" do |data, options = {}|            # def polar_area_chart(data, options = {})
-          chart type, data, options                                      #   chart 'polar_area', data, options
-        end                                                              # end
+        define_method "#{type}_chart" do |data, options = {}, plugins = {}|            # def polar_area_chart(data, options = {}, plugins = {})
+          chart type, data, options, plugins                                           #   chart 'polar_area', data, options, plugins
+        end                                                                            # end
       end
       include Chartjs::ChartHelpers
     end
 
     private
 
-    def chart(type, data, options)
+    def chart(type, data, options, plugins)
+      opts = options.dup
+
       @chart_id ||= -1
-      element_id = options.delete(:id)     || "chart-#{@chart_id += 1}"
-      css_class  = options.delete(:class)  || 'chart'
-      width      = options.delete(:width)  || '400'
-      height     = options.delete(:height) || '400'
+      element_id = opts.delete(:id)     || "chart-#{@chart_id += 1}"
+      css_class  = opts.delete(:class)  || 'chart'
+      width      = opts.delete(:width)  || '400'
+      height     = opts.delete(:height) || '400'
 
       canvas = content_tag :canvas, '', id: element_id, class: css_class, width: width, height: height
 
-      script = javascript_tag do
+      script = javascript_tag(nonce: true) do
         <<-END.squish.html_safe
         (function() {
           var initChart = function() {
@@ -43,7 +45,8 @@ module Chartjs
             var chart = new Chart(ctx, {
               type:    "#{camel_case type}",
               data:    #{to_javascript_string data},
-              options: #{to_javascript_string options}
+              options: #{to_javascript_string opts},
+              plugins: #{to_javascript_string plugins},
             });
           };
 

data/lib/chartjs/version.rb

@@ -1,3 +1,3 @@
 module Chartjs
-  VERSION = "3.6.2"
+  VERSION = "3.7.0"
 end