simple_chartjs 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a2e61e50e0ea78453e8fce2d852c51a560fc6b
-  data.tar.gz: 9fbcc04fab8b4c78a04788036001a709035ed5b4
+  metadata.gz: 38df04a462a9350de41d327c05513bfe047f2965
+  data.tar.gz: 315b24a1398347a40a7ddca3c9347bf517aa2e06
 SHA512:
-  metadata.gz: 079a116b48d8e12569ed19098b783cf7a97d949de98e6d00fe162dde52b7e52cbd55d5bbdcf7bae33754fb98f3b9a04d5eede9fad0fa41b77d959bc60c053127
-  data.tar.gz: 0fdab0d3dd24e30cbc6e78037d810b74a44badddb81c56eacbde45658c36df9ffe8c215b33a8bccc9203df575e1c629850633642b1f50da1c5adf3fa433ed78d
+  metadata.gz: 67f8eec57e9103b6c73843091cdcda6e2632c6be024ae7a393f076bdf41c82064d2534820f9ac2d6c7f1e95016c92d358af98e74a27dea03c87027804d5822e9
+  data.tar.gz: 2613e22bb50beb16cf858aef733bb6595dae3525623040789b019a6cb5802d13dfe3e13c65c7d4a74edeae47d2c1584bd7ca36463148377c1ac5f804c717c26a

data/app/assets/javascripts/simple_chartjs.js

@@ -72,12 +72,16 @@ SimpleChart.prototype.configureOption = function(option_name, current_options, o
 SimpleChart.prototype.formatChartData = function(data) {
   var chartData = data;
   this.formatArrayRubyObjects(chartData.datasets);
-  if(!(Object.keys(this.datasetProperties).length === 0)) {
+  if(Object.keys(this.datasetProperties).length !== 0) {
     for(property in this.datasetProperties) {
       if(Array.isArray(this.datasetProperties[property])) {
-        for (var i = 0; i < this.datasetProperties[property].length; i++) {
+        for (var i = 0; i < chartData.datasets.length; i++) {
           chartData.datasets[i][property] = this.datasetProperties[property][i];
         }
+      } else if(typeof(this.datasetProperties[property]) === 'function') {
+        for (var i = 0; i < chartData.datasets.length; i++) {
+          chartData.datasets[i][property] = this.datasetProperties[property](chartData.datasets[i]);
+        }
       } else {
         for (var i = 0; i < chartData.datasets.length; i++) {
           chartData.datasets[i][property] = this.datasetProperties[property];
@@ -85,6 +89,7 @@ SimpleChart.prototype.formatChartData = function(data) {
       }
     }
   }
+
   return chartData;
 }
 

data/lib/chartjs/version.rb

@@ -1,3 +1,3 @@
 module SimpleChartjs
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_chartjs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Harry Venables