chartkick 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d82466b6703318eaead4b787e2029ed81b6419
-  data.tar.gz: 6a94782f3c4fbfd27171e03e89e1288e97221287
+  metadata.gz: c4ad83e0908f7d19f80e1777c9b06b1bc9bb4e5f
+  data.tar.gz: eae7fc7ec9cb6ae8e1a207ae11fe5e728953cf95
 SHA512:
-  metadata.gz: b14d7a3cd54eb4d67af1efa3776c7f9c5bf6c07c8d8d22aff8294312236095b1ab5de4850c330d938aae2f0b21108c31aacad0da73a0248b190da79fbf637884
-  data.tar.gz: ce3df7336aa518bc1c3859c7e113607bd851779c5efc23b483f1154fdc2913d207ab0fffc6ed86b82f9743a1d656f4034bba4e67520769c2bff06d851c006684
+  metadata.gz: 1703d7ff64748ebd96aa952e9804f40b7abfeb719a18d4730529612d5fe17513ee95a1d6cb8da5b54f8148c2b0ccdb135c28e5ed2f095ddcb081a3f310390425
+  data.tar.gz: c6e81a464f25d378e64bb8976681e51a2d5b5cdb97eff53379c09874b24d02a0d8b0afa30ea80bbe4f7e78624c37db79c62c7e8b395d085b0d9193e8658768c6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.4
+
+- Added global options
+- Added `colors` option
+
 ## 1.2.3
 
 - Added geo chart

data/README.md

@@ -88,6 +88,12 @@ Min and max values (except pie chart)
 <%= line_chart data, min: 1000, max: 5000 %>
 ```
 
+Colors
+
+```erb
+<%= line_chart data, colors: ["pink", "#999"] %>
+```
+
 Stacked columns or bars
 
 ```erb
@@ -106,6 +112,8 @@ You can pass options directly to the charting library with:
 <%= line_chart data, library: {backgroundColor: "#eee"} %>
 ```
 
+See the documentation for [Google Charts](https://developers.google.com/chart/interactive/docs/gallery) and [Highcharts](http://api.highcharts.com/highcharts) for more info.
+
 You can also pass a content_for option, which will put the javascript in a content block.  This is great for including all of your javascript at the bottom of the page.
 
 ```erb
@@ -118,10 +126,16 @@ Then, in your layout:
 <%= yield_content :charts_js %> <%# Padrino %>
 ```
 
-To make this the default, create an initializer with:
+### Global Options
+
+To set options for all of your charts, create an initializer with:
 
 ```ruby
-Chartkick.content_for = :charts_js
+Chartkick.options = {
+  height: "400px",
+  colors: ["pink", "#999"],
+  content_for: :charts_js
+}
 ```
 
 ### Data

data/app/assets/javascripts/chartkick.js

@@ -129,6 +129,10 @@
         setStacked(options);
       }
 
+      if (opts.colors) {
+        options.colors = opts.colors;
+      }
+
       // merge library last
       options = merge(options, opts.library || {});
 
@@ -323,7 +327,11 @@
       };
 
       this.renderPieChart = function (chart) {
-        var options = merge(defaultOptions, chart.options.library || {});
+        var chartOptions = {};
+        if (chart.options.colors) {
+          chartOptions.colors = chart.options.colors;
+        }
+        var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
         options.chart.renderTo = chart.element.id;
         options.series = [{
           type: "pie",
@@ -536,6 +544,9 @@
               height: "80%"
             }
           };
+          if (chart.options.colors) {
+            chartOptions.colors = chart.options.colors;
+          }
           var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
 
           var data = new google.visualization.DataTable();
@@ -600,7 +611,7 @@
           var chartOptions = {
             legend: "none",
             colorAxis: {
-              colors: ["#f6c7b6", "#ce502d"]
+              colors: chart.options.colors || ["#f6c7b6", "#ce502d"]
             }
           };
           var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});

data/lib/chartkick.rb

@@ -6,5 +6,7 @@ require "chartkick/sinatra" if defined?(Sinatra)
 module Chartkick
   class << self
     attr_accessor :content_for
+    attr_accessor :options
   end
+  self.options = {}
 end

data/lib/chartkick/helper.rb

@@ -32,7 +32,7 @@ module Chartkick
 
     def chartkick_chart(klass, data_source, options, &block)
       @chartkick_chart_id ||= 0
-      options = options.dup
+      options = chartkick_deep_merge(Chartkick.options, options)
       element_id = options.delete(:id) || "chart-#{@chartkick_chart_id += 1}"
       height = options.delete(:height) || "300px"
       # content_for: nil must override default
@@ -57,5 +57,15 @@ JS
       html.respond_to?(:html_safe) ? html.html_safe : html
     end
 
+    # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+    def chartkick_deep_merge(hash_a, hash_b)
+      hash_a = hash_a.dup
+      hash_b.each_pair do |k,v|
+        tv = hash_a[k]
+        hash_a[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+      end
+      hash_a
+    end
+
   end
 end

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Andrew Kane