chartkick 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848d18904d57decb720961b641517820104fd6cc
-  data.tar.gz: 878e5deed5566486939c041003fffb354c1ad1c4
+  metadata.gz: 6c0dcec810efb2cf5b62a2329f89727b492bafa5
+  data.tar.gz: 4ac0c0fdfe58ef357f9ac690789d3bb30d7b0e9c
 SHA512:
-  metadata.gz: 1916921d38f7cddb051f9e8ac1d6599449f95c4b30d2b6168f80e1155a3c405c53ecd10521b88202298261df6a211d2c3747af0f239083c745d1a072510442c3
-  data.tar.gz: 6a54d67e004bd435689b787be2063be304f4ee0b1e6d52fc81b2ebcd3f000b23f703b676332980e7eaa399dd725fb94b11fe47d5e62a610794b977e77934f69c
+  metadata.gz: 85ad01a7d5f0e83129a32849f3cc3703d2d06b997bf5477ed2a86d2b18063fb4c3e2396361ef7cdcb23b2cea8041cb9d98f87bb7c05123f22270bb5f3660542b
+  data.tar.gz: 5bc4531ebb50c7a139a94dfbaae452075571445e161227e3c7c1c615f32bfd3babde9c734c341db6a800b06054d0b9fcb81f901efbf75c50b7d7186d5a08a754

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.1.2
+
+- Added `defer` option
+- Added `nonce` option
+- Updated Chartkick.js to 2.1.1
+
 ## 2.1.1
 
 - Use custom version of Chart.js to fix label overlap

data/README.md

@@ -180,8 +180,8 @@ Chartkick.options[:content_for] = :charts_js
 Then, in your layout:
 
 ```erb
-<%= yield :charts_js %> <%# Rails %>
-<%= yield_content :charts_js %> <%# Padrino %>
+<%= yield :charts_js %> <!-- Rails -->
+<%= yield_content :charts_js %> <!-- Padrino -->
 ```
 
 This is great for including all of your JavaScript at the bottom of the page.
@@ -242,7 +242,7 @@ In `application.js`, add:
 In your views, before `application.js`, add:
 
 ```erb
-<%= javascript_include_tag "https://www.google.com/jsapi" %>
+<%= javascript_include_tag "https://www.gstatic.com/charts/loader.js" %>
 ```
 
 #### Highcharts
@@ -258,23 +258,14 @@ In `application.js`, add:
 
 Works with Highcharts 2.1+
 
-### For Sinatra
+### Sinatra and Padrino
 
-You must include `chartkick.js` manually.  [Download it here](https://raw.github.com/ankane/chartkick/master/app/assets/javascripts/chartkick.js)
+You must include `chartkick.js` manually. [Download it here](https://raw.github.com/ankane/chartkick/master/app/assets/javascripts/chartkick.js)
 
 ```html
-<script src="https://www.google.com/jsapi"></script>
 <script src="chartkick.js"></script>
 ```
 
-### For Padrino
-
-You must include `chartkick.js` manually.  [Download it here](https://raw.github.com/ankane/chartkick/master/app/assets/javascripts/chartkick.js)
-
-```erb
-<%= javascript_include_tag "https://www.google.com/jsapi", "chartkick" %>
-```
-
 ### Localization
 
 To specify a language for Google Charts, add:
@@ -285,6 +276,14 @@ Chartkick.configure({"language": "de"});
 
 after the JavaScript files and before your charts.
 
+### Multiple Libraries
+
+If more than one charting library is loaded, choose between them with:
+
+```erb
+<%= line_chart data, adapter: "google" %> <!-- or highcharts -->
+```
+
 ## JavaScript API
 
 Access a chart with:

data/app/assets/javascripts/chartkick.js

@@ -1,8 +1,8 @@
 /*
  * Chartkick.js
- * Create beautiful JavaScript charts with minimal code
+ * Create beautiful charts with one line of JavaScript
  * https://github.com/ankane/chartkick.js
- * v2.1.0
+ * v2.1.1
  * MIT License
  */
 
@@ -835,7 +835,10 @@
               }
             ]
           },
-          legend: {}
+          legend: {},
+          tooltips: {
+            displayColors: false
+          }
         };
 
         // http://there4.io/2012/05/02/google-chart-color-list/
@@ -984,7 +987,8 @@
             }
             labels.push(value);
             for (j = 0; j < series.length; j++) {
-              rows2[j].push(rows[i][j]);
+              // Chart.js doesn't like undefined
+              rows2[j].push(rows[i][j] || null);
             }
           }
 
@@ -1032,7 +1036,8 @@
               } else if (day || timeDiff > 10) {
                 options.scales.xAxes[0].time.unit = "day";
                 step = 1;
-              } else if (hour) {
+              } else if (hour || timeDiff > 0.5) {
+                options.scales.xAxes[0].time.displayFormats = {hour: "MMM D, h a"};
                 options.scales.xAxes[0].time.unit = "hour";
                 step = 1 / 24.0;
               } else if (minute) {
@@ -1041,7 +1046,6 @@
                 step = 1 / 24.0 / 60.0;
               }
 
-
               if (step && timeDiff > 0) {
                 var unitStepSize = Math.ceil(timeDiff / step / (chart.element.offsetWidth / 100.0));
                 if (week && step === 1) {

data/lib/chartkick/helper.rb

@@ -43,16 +43,36 @@ module Chartkick
       element_id = options.delete(:id) || "chart-#{@chartkick_chart_id += 1}"
       height = options.delete(:height) || "300px"
       width = options.delete(:width) || "100%"
+      defer = !!options.delete(:defer)
       # content_for: nil must override default
       content_for = options.key?(:content_for) ? options.delete(:content_for) : Chartkick.content_for
-
+      nonce = options.key?(:nonce) ? " nonce=\"#{ERB::Util.html_escape(options.delete(:nonce))}\"" : nil
       html = (options.delete(:html) || %(<div id="%{id}" style="height: %{height}; width: %{width}; text-align: center; color: #999; line-height: %{height}; font-size: 14px; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif;">Loading...</div>)) % {id: ERB::Util.html_escape(element_id), height: ERB::Util.html_escape(height), width: ERB::Util.html_escape(width)}
 
-      js = <<JS
-<script type="text/javascript">
-  new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.respond_to?(:chart_json) ? data_source.chart_json : data_source.to_json}, #{options.to_json});
+      createjs = "new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.respond_to?(:chart_json) ? data_source.chart_json : data_source.to_json}, #{options.to_json});"
+      if defer
+        js = <<JS
+<script type="text/javascript"#{nonce}>
+  (function() {
+    var createChart = function() { #{createjs} };
+    if (window.addEventListener) {
+      window.addEventListener("load", createChart, true);
+    } else if (window.attachEvent) {
+      window.attachEvent("onload", createChart);
+    } else {
+      createChart();
+    }
+  })();
+</script>
+JS
+      else
+        js = <<JS
+<script type="text/javascript"#{nonce}>
+  #{createjs}
 </script>
 JS
+      end
+
       if content_for
         content_for(content_for) { js.respond_to?(:html_safe) ? js.html_safe : js }
       else

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler