chartkick 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0dba34a7302ee5f73cba7e55be0014c639431d6
-  data.tar.gz: f72f4d80febb09fd928abdf75c3967bbdeeb6d21
+  metadata.gz: 00b03d10b24d6e36edf3061bdd594b83b831776f
+  data.tar.gz: eb2175cda000c9ed560f9b28dc08fd3eb9fd5b19
 SHA512:
-  metadata.gz: 73351da6753359cb7af17028059d3077788c2f8a6912f79f96243923a58bf0ab64911004661352efaceff634ceff5742eafa98b27a45d7a9e97365933d8b8ab2
-  data.tar.gz: 4cadd3bf93432e26968faf47c822c228ed184e228324cffbaa8b7e4188ec5140647ffd9d87e84f67bf3b2c56376bab7ed0548d7ce076e4954fb2773d13f54e13
+  metadata.gz: 133267fc6a6a015495905656bac3be481ad205ed6aa81a5b7bdd68523617b798a72f3e2aac5f62834f62382c63d0462a28f1b1b934239db955cf6abfbd5f3999
+  data.tar.gz: c7ebf3c44d41a69f099e5a46cd81f21ae501b99c7a5660d4e3a082ef87f01d7cbc9efd7fe393a8f1499b85458197ce4d76d2d1b7b52b9084bcebe4f3be96d718

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.0
+
+- Added timelines
+
 ## 1.2.5
 
 - Added support for multiple groups

data/README.md

@@ -48,6 +48,12 @@ Geo chart
 <%= geo_chart Medal.group(:country).count %>
 ```
 
+Timeline
+
+```erb
+<%= timeline [["Washington", "1789-04-29", "1797-03-03"], ["Adams", "1797-03-03", "1801-03-03"]] %>
+```
+
 Multiple series
 
 ```erb

data/app/assets/javascripts/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful Javascript charts with minimal code
  * https://github.com/ankane/chartkick.js
- * v1.2.1
+ * v1.2.2
  * MIT License
  */
 
@@ -13,8 +13,6 @@
 
   var Chartkick, ISO8601_PATTERN, DECIMAL_SEPARATOR, adapters = [];
 
-  var $ = window.jQuery || window.Zepto || window.$;
-
   // helpers
 
   function isArray(variable) {
@@ -154,6 +152,7 @@
   }
 
   function getJSON(element, url, success) {
+    var $ = window.jQuery || window.Zepto || window.$;
     $.ajax({
       dataType: "json",
       url: url,
@@ -401,17 +400,37 @@
     var GoogleChartsAdapter = new function () {
       var google = window.google;
 
-      // load from google
-      var loaded = false;
-      google.setOnLoadCallback(function () {
-        loaded = true;
-      });
-      google.load("visualization", "1.0", {"packages": ["corechart"]});
+      var loaded = {};
+      var callbacks = [];
+
+      var runCallbacks = function() {
+        var cb, call;
+        for (var i = 0; i < callbacks.length; i++) {
+          cb = callbacks[i];
+          call = (cb.pack == "corechart" && isFunction(google.visualization.LineChart)) || (cb.pack == "timeline" && isFunction(google.visualization.Timeline))
+          if (call) {
+            cb.callback();
+            callbacks.splice(i, 1);
+            i--;
+          }
+        }
+      };
+
+      google.setOnLoadCallback(runCallbacks);
+
+      var waitForLoaded = function (pack, callback) {
+        if (!callback) {
+          callback = pack;
+          pack = "corechart";
+        }
+
+        callbacks.push({pack: pack, callback: callback});
 
-      var waitForLoaded = function (callback) {
-        google.setOnLoadCallback(callback); // always do this to prevent race conditions (watch out for other issues due to this)
-        if (loaded) {
-          callback();
+        if (loaded[pack]) {
+          runCallbacks();
+        } else {
+          loaded[pack] = true;
+          google.load("visualization", "1.0", {"packages": [pack]});
         }
       };
 
@@ -627,7 +646,33 @@
           });
         });
       };
+
+      this.renderTimeline = function (chart) {
+        waitForLoaded("timeline", function () {
+          var chartOptions = {
+            legend: "none"
+          };
+
+          if (chart.options.colors) {
+            chartOptions.colorAxis.colors = chart.options.colors;
+          }
+          var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
+
+          var data = new google.visualization.DataTable();
+          data.addColumn({type: "string", id: "Name"});
+          data.addColumn({type: "date", id: "Start"});
+          data.addColumn({type: "date", id: "End"});
+          data.addRows(chart.data);
+
+          chart.chart = new google.visualization.Timeline(chart.element);
+
+          resize(function () {
+            chart.chart.draw(data, options);
+          });
+        });
+      };
     };
+
     adapters.push(GoogleChartsAdapter);
   }
 
@@ -636,7 +681,7 @@
   // to get the name of the chart class
   function renderChart(chartType, chart) {
     var i, adapter, fnName;
-    fnName = "render" + chartType + "Chart";
+    fnName = "render" + chartType;
 
     for (i = 0; i < adapters.length; i++) {
       adapter = adapters[i];
@@ -689,34 +734,49 @@
     return perfectData;
   }
 
+  function processTime(data)
+  {
+    var i;
+    for (i = 0; i < data.length; i++) {
+      data[i][1] = toDate(data[i][1]);
+      data[i][2] = toDate(data[i][2]);
+    }
+    return data;
+  }
+
   function processLineData(chart) {
     chart.data = processSeries(chart.data, chart.options, true);
-    renderChart("Line", chart);
+    renderChart("LineChart", chart);
   }
 
   function processColumnData(chart) {
     chart.data = processSeries(chart.data, chart.options, false);
-    renderChart("Column", chart);
+    renderChart("ColumnChart", chart);
   }
 
   function processPieData(chart) {
     chart.data = processSimple(chart.data);
-    renderChart("Pie", chart);
+    renderChart("PieChart", chart);
   }
 
   function processBarData(chart) {
     chart.data = processSeries(chart.data, chart.options, false);
-    renderChart("Bar", chart);
+    renderChart("BarChart", chart);
   }
 
   function processAreaData(chart) {
     chart.data = processSeries(chart.data, chart.options, true);
-    renderChart("Area", chart);
+    renderChart("AreaChart", chart);
   }
 
   function processGeoData(chart) {
     chart.data = processSimple(chart.data);
-    renderChart("Geo", chart);
+    renderChart("GeoChart", chart);
+  }
+
+  function processTimelineData(chart) {
+    chart.data = processTime(chart.data);
+    renderChart("Timeline", chart);
   }
 
   function setElement(chart, element, dataSource, opts, callback) {
@@ -751,6 +811,9 @@
     GeoChart: function (element, dataSource, opts) {
       setElement(this, element, dataSource, opts, processGeoData);
     },
+    Timeline: function (element, dataSource, opts) {
+      setElement(this, element, dataSource, opts, processTimelineData);
+    },
     charts: {}
   };
 

data/lib/chartkick/helper.rb

@@ -28,6 +28,10 @@ module Chartkick
       chartkick_chart "GeoChart", data_source, options
     end
 
+    def timeline(data_source, options = {})
+      chartkick_chart "Timeline", data_source, options
+    end
+
     private
 
     def chartkick_chart(klass, data_source, options, &block)

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler