chartkick 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3fe5dc62f6b7171a27d19d76dd81e10b045a909
-  data.tar.gz: 9a7a9a2e5a3198176367141c7612cc28ae071296
+  metadata.gz: ea705341b63c82aef63f8da9e1f98d8caad46097
+  data.tar.gz: 955115a1463d433fa2c14d70541ff7ac9f62c3eb
 SHA512:
-  metadata.gz: e77ef7d0f14c393d270c7cbc4c340a14559c85b524593c7bfa7d773f4109e61d0bad93017193bf4edebb4897f9cf5fecb2ba5900eac7369ca7a61dfd850356f4
-  data.tar.gz: 0c0196a6877fd1a33eeece1e6990f3c9fbe6c1008890754ff9ce4d78ecde2669499b7947ecffcc6cfa3eeda1c6fbbf30d6620bbb39ebc284f1d1bad27906b4fd
+  metadata.gz: 48540e759da663290d91093ce58ef3e59258682f441401c1cde301057b83f8bcefda8a62a9d76ea8efbf4661eb9998c6d4463f8b4d239de75fd720d9a41d3f57
+  data.tar.gz: 845ca4aee7e2262a14dd46dfb73d5b975955f7bf86fd19de7f7407ea3889b9829789752b16441f9fb24b5b9e041650c8aca5821b172cc69034fb7b61ef8b1317

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.1
+
+- Added localization for Google Charts
+
 ## 1.2.0
 
 - Added bar chart and area chart

data/README.md

@@ -6,7 +6,7 @@ Create beautiful Javascript charts with one line of Ruby. No more fighting with
 
 Works with Rails, Sinatra and most browsers (including IE 6)
 
-:two_hearts: A perfect companion to [groupdate](http://ankane.github.io/groupdate/)
+:two_hearts: A perfect companion to [groupdate](https://github.com/ankane/groupdate) and [active_median](https://github.com/ankane/active_median)
 
 ## Usage
 
@@ -31,13 +31,13 @@ Column chart
 Bar chart
 
 ```erb
-<%= column_chart Event.group_by_day_of_week(:starts_at).count %>
+<%= bar_chart Shirt.group("size").sum(:price) %>
 ```
 
 Area chart
 
 ```erb
-<%= area_chart Visit.group_by_minute(:created_at).count %>
+<%= area_chart Visit.group_by_minute(:created_at).maximum(:load_time) %>
 ```
 
 Multiple series (except pie chart)
@@ -73,25 +73,25 @@ end
 Id and height
 
 ```erb
-<%= line_chart User.group_by_day(:created_at).count, :id => "users-chart", :height => "500px" %>
+<%= line_chart data, :id => "users-chart", :height => "500px" %>
 ```
 
 Min and max values (except pie chart)
 
 ```erb
-<%= line_chart User.group_by_day(:created_at).count, :min => 1000, :max => 5000 %>
+<%= line_chart data, :min => 1000, :max => 5000 %>
 ```
 
 You can pass options directly to the charting library with:
 
 ```erb
-<%= line_chart User.group_by_day(:created_at).count, :library => {:backgroundColor => "#eee"} %>
+<%= line_chart data, :library => {:backgroundColor => "#eee"} %>
 ```
 
 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
-<%= line_chart User.group_by_day(:created_at).count, :content_for => :js_initialization %>
+<%= line_chart data, :content_for => :js_initialization %>
 ```
 Then, in your layout:
 
@@ -173,6 +173,18 @@ In addition, you must specify `http` or `https` if you use Google Charts, since
 <%= javascript_include_tag "https://www.google.com/jsapi", "chartkick" %>
 ```
 
+### Localization
+
+To specify a language for Google Charts, add:
+
+```html
+<script>
+  var Chartkick = {"language": "de"};
+</script>
+```
+
+**before** the javascript files.
+
 ## No Ruby? No Problem
 
 Check out [chartkick.js](https://github.com/ankane/chartkick.js)
@@ -189,8 +201,9 @@ Chartkick follows [Semantic Versioning](http://semver.org/)
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+Everyone is encouraged to help improve this project. Here are a few ways you can help:
+
+- [Report bugs](https://github.com/ankane/chartkick/issues)
+- Fix bugs and [submit pull requests](https://github.com/ankane/chartkick/pulls)
+- Write, clarify, or fix documentation
+- Suggest or add new features

data/app/assets/javascripts/chartkick.js

@@ -2,24 +2,34 @@
  * Chartkick.js
  * Create beautiful Javascript charts with minimal code
  * https://github.com/ankane/chartkick.js
- * v1.1.0
+ * v1.1.1
  * MIT License
  */
 
-/*jslint browser: true, indent: 2, plusplus: true */
-/*global google, $*/
+/*jslint browser: true, indent: 2, plusplus: true, vars: true */
+/*global google, Highcharts, $*/
 
-(function() {
+(function () {
   'use strict';
 
+  var Chartkick, ISO8601_PATTERN, DECIMAL_SEPARATOR, defaultOptions, hideLegend,
+    setMin, setMax, jsOptions, loaded, waitForLoaded, setBarMin, setBarMax, createDataTable, resize;
+
+  // only functions that need defined specific to charting library
+  var renderLineChart, renderPieChart, renderColumnChart, renderBarChart, renderAreaChart;
+
   // helpers
 
   function isArray(variable) {
     return Object.prototype.toString.call(variable) === "[object Array]";
   }
 
+  function isFunction(variable) {
+    return variable instanceof Function;
+  }
+
   function isPlainObject(variable) {
-    return variable instanceof Object;
+    return !isFunction(variable) && variable instanceof Object;
   }
 
   // https://github.com/madrobby/zepto/blob/master/src/zepto.js
@@ -34,8 +44,7 @@
           target[key] = [];
         }
         extend(target[key], source[key]);
-      }
-      else if (source[key] !== undefined) {
+      } else if (source[key] !== undefined) {
         target[key] = source[key];
       }
     }
@@ -49,8 +58,8 @@
   }
 
   // https://github.com/Do/iso8601.js
-  var ISO8601_PATTERN = /(\d\d\d\d)(\-)?(\d\d)(\-)?(\d\d)(T)?(\d\d)(:)?(\d\d)?(:)?(\d\d)?([\.,]\d+)?($|Z|([\+\-])(\d\d)(:)?(\d\d)?)/i;
-  var DECIMAL_SEPARATOR = String(1.5).charAt(1);
+  ISO8601_PATTERN = /(\d\d\d\d)(\-)?(\d\d)(\-)?(\d\d)(T)?(\d\d)(:)?(\d\d)?(:)?(\d\d)?([\.,]\d+)?($|Z|([\+\-])(\d\d)(:)?(\d\d)?)/i;
+  DECIMAL_SEPARATOR = String(1.5).charAt(1);
 
   function parseISO8601(input) {
     var day, hour, matches, milliseconds, minutes, month, offset, result, seconds, type, year;
@@ -97,7 +106,7 @@
   }
 
   function jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax) {
-    return function(series, opts, chartOptions) {
+    return function (series, opts, chartOptions) {
       var options = merge({}, defaultOptions);
       options = merge(options, chartOptions || {});
 
@@ -110,8 +119,7 @@
       // min
       if ("min" in opts) {
         setMin(options, opts.min);
-      }
-      else if (!negativeValues(series)) {
+      } else if (!negativeValues(series)) {
         setMin(options, 0);
       }
 
@@ -127,12 +135,94 @@
     };
   }
 
-  // only functions that need defined specific to charting library
-  var renderLineChart, renderPieChart, renderColumnChart, renderBarChart, renderAreaChart;
+  function setText(element, text) {
+    if (document.body.innerText) {
+      element.innerText = text;
+    } else {
+      element.textContent = text;
+    }
+  }
+
+  function chartError(element, message) {
+    setText(element, "Error Loading Chart: " + message);
+    element.style.color = "#ff0000";
+  }
+
+  function getJSON(element, url, success) {
+    $.ajax({
+      dataType: "json",
+      url: url,
+      success: success,
+      error: function (jqXHR, textStatus, errorThrown) {
+        var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message;
+        chartError(element, message);
+      }
+    });
+  }
+
+  function errorCatcher(element, data, opts, callback) {
+    try {
+      callback(element, data, opts);
+    } catch (err) {
+      chartError(element, err.message);
+      throw err;
+    }
+  }
+
+  function fetchDataSource(element, dataSource, opts, callback) {
+    if (typeof dataSource === "string") {
+      getJSON(element, dataSource, function (data, textStatus, jqXHR) {
+        errorCatcher(element, data, opts, callback);
+      });
+    } else {
+      errorCatcher(element, dataSource, opts, callback);
+    }
+  }
+
+  // type conversions
+
+  function toStr(n) {
+    return "" + n;
+  }
+
+  function toFloat(n) {
+    return parseFloat(n);
+  }
+
+  function toDate(n) {
+    if (typeof n !== "object") {
+      if (typeof n === "number") {
+        n = new Date(n * 1000); // ms
+      } else { // str
+        // try our best to get the str into iso8601
+        // TODO be smarter about this
+        var str = n.replace(/ /, "T").replace(" ", "").replace("UTC", "Z");
+        n = parseISO8601(str) || new Date(n);
+      }
+    }
+    return n;
+  }
+
+  function toArr(n) {
+    if (!isArray(n)) {
+      var arr = [], i;
+      for (i in n) {
+        if (n.hasOwnProperty(i)) {
+          arr.push([i, n[i]]);
+        }
+      }
+      n = arr;
+    }
+    return n;
+  }
+
+  function sortByTime(a, b) {
+    return a[0].getTime() - b[0].getTime();
+  }
 
   if ("Highcharts" in window) {
 
-    var defaultOptions = {
+    defaultOptions = {
       chart: {},
       xAxis: {
         labels: {
@@ -173,21 +263,21 @@
       }
     };
 
-    var hideLegend = function(options) {
+    hideLegend = function (options) {
       options.legend.enabled = false;
     };
 
-    var setMin = function(options, min) {
+    setMin = function (options, min) {
       options.yAxis.min = min;
     };
 
-    var setMax = function(options, max) {
+    setMax = function (options, max) {
       options.yAxis.max = max;
     };
 
-    var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
+    jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
 
-    renderLineChart = function(element, series, opts, chartType) {
+    renderLineChart = function (element, series, opts, chartType) {
       chartType = chartType || "spline";
       var chartOptions = {};
       if (chartType === "areaspline") {
@@ -220,7 +310,7 @@
       new Highcharts.Chart(options);
     };
 
-    renderPieChart = function(element, series, opts) {
+    renderPieChart = function (element, series, opts) {
       var options = merge(defaultOptions, opts.library || {});
       options.chart.renderTo = element.id;
       options.series = [{
@@ -231,7 +321,7 @@
       new Highcharts.Chart(options);
     };
 
-    renderColumnChart = function(element, series, opts, chartType) {
+    renderColumnChart = function (element, series, opts, chartType) {
       chartType = chartType || "column";
       var options = jsOptions(series, opts), i, j, s, d, rows = [];
       options.chart.type = chartType;
@@ -274,22 +364,27 @@
       new Highcharts.Chart(options);
     };
 
-    renderBarChart = function(element, series, opts) {
+    renderBarChart = function (element, series, opts) {
       renderColumnChart(element, series, opts, "bar");
     };
 
-    renderAreaChart = function(element, series, opts) {
+    renderAreaChart = function (element, series, opts) {
       renderLineChart(element, series, opts, "areaspline");
     };
   } else if ("google" in window) { // Google charts
     // load from google
-    var loaded = false;
-    google.setOnLoadCallback(function() {
+    loaded = false;
+    google.setOnLoadCallback(function () {
       loaded = true;
     });
-    google.load("visualization", "1.0", {"packages": ["corechart"]});
+    var loadOptions = {"packages": ["corechart"]};
+    var config = window.Chartkick || {};
+    if (config.language) {
+      loadOptions.language = config.language;
+    }
+    google.load("visualization", "1.0", loadOptions);
 
-    var waitForLoaded = function(callback) {
+    waitForLoaded = function (callback) {
       google.setOnLoadCallback(callback); // always do this to prevent race conditions (watch out for other issues due to this)
       if (loaded) {
         callback();
@@ -297,7 +392,7 @@
     };
 
     // Set chart options
-    var defaultOptions = {
+    defaultOptions = {
       chartArea: {},
       fontName: "'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif",
       pointSize: 6,
@@ -337,30 +432,30 @@
       }
     };
 
-    var hideLegend = function(options) {
+    hideLegend = function (options) {
       options.legend.position = "none";
     };
 
-    var setMin = function(options, min) {
+    setMin = function (options, min) {
       options.vAxis.viewWindow.min = min;
     };
 
-    var setMax = function(options, max) {
+    setMax = function (options, max) {
       options.vAxis.viewWindow.max = max;
     };
 
-    var setBarMin = function(options, min) {
+    setBarMin = function (options, min) {
       options.hAxis.viewWindow.min = min;
     };
 
-    var setBarMax = function(options, max) {
+    setBarMax = function (options, max) {
       options.hAxis.viewWindow.max = max;
     };
 
-    var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
+    jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
 
     // cant use object as key
-    var createDataTable = function(series, columnType) {
+    createDataTable = function (series, columnType) {
       var data = new google.visualization.DataTable();
       data.addColumn(columnType, "");
 
@@ -393,29 +488,28 @@
       return data;
     };
 
-    var resize = function(callback) {
+    resize = function (callback) {
       if (window.attachEvent) {
         window.attachEvent("onresize", callback);
-      }
-      else if (window.addEventListener) {
+      } else if (window.addEventListener) {
         window.addEventListener("resize", callback, true);
       }
       callback();
     };
 
-    renderLineChart = function(element, series, opts) {
-      waitForLoaded(function() {
+    renderLineChart = function (element, series, opts) {
+      waitForLoaded(function () {
         var options = jsOptions(series, opts);
         var data = createDataTable(series, "datetime");
         var chart = new google.visualization.LineChart(element);
-        resize( function() {
+        resize(function () {
           chart.draw(data, options);
         });
       });
     };
 
-    renderPieChart = function(element, series, opts) {
-      waitForLoaded(function() {
+    renderPieChart = function (element, series, opts) {
+      waitForLoaded(function () {
         var chartOptions = {
           chartArea: {
             top: "10%",
@@ -430,25 +524,25 @@
         data.addRows(series);
 
         var chart = new google.visualization.PieChart(element);
-        resize( function() {
+        resize(function () {
           chart.draw(data, options);
         });
       });
     };
 
-    renderColumnChart = function(element, series, opts) {
-      waitForLoaded(function() {
+    renderColumnChart = function (element, series, opts) {
+      waitForLoaded(function () {
         var options = jsOptions(series, opts);
         var data = createDataTable(series, "string");
         var chart = new google.visualization.ColumnChart(element);
-        resize( function() {
+        resize(function () {
           chart.draw(data, options);
         });
       });
     };
 
-    renderBarChart = function(element, series, opts) {
-       waitForLoaded(function() {
+    renderBarChart = function (element, series, opts) {
+      waitForLoaded(function () {
         var chartOptions = {
           hAxis: {
             gridlines: {
@@ -459,14 +553,14 @@
         var options = jsOptionsFunc(defaultOptions, hideLegend, setBarMin, setBarMax)(series, opts, chartOptions);
         var data = createDataTable(series, "string");
         var chart = new google.visualization.BarChart(element);
-        resize( function() {
+        resize(function () {
           chart.draw(data, options);
         });
       });
     };
 
-    renderAreaChart = function(element, series, opts) {
-      waitForLoaded(function() {
+    renderAreaChart = function (element, series, opts) {
+      waitForLoaded(function () {
         var chartOptions = {
           isStacked: true,
           pointSize: 0,
@@ -475,104 +569,19 @@
         var options = jsOptions(series, opts, chartOptions);
         var data = createDataTable(series, "datetime");
         var chart = new google.visualization.AreaChart(element);
-        resize( function() {
+        resize(function () {
           chart.draw(data, options);
         });
       });
     };
   } else { // no chart library installed
-    renderLineChart = renderPieChart = renderColumnChart = renderBarChart = renderAreaChart = function() {
+    renderLineChart = renderPieChart = renderColumnChart = renderBarChart = renderAreaChart = function () {
       throw new Error("Please install Google Charts or Highcharts");
     };
   }
 
-  function setText(element, text) {
-    if (document.body.innerText) {
-      element.innerText = text;
-    } else {
-      element.textContent = text;
-    }
-  }
-
-  function chartError(element, message) {
-    setText(element, "Error Loading Chart: " + message);
-    element.style.color = "#ff0000";
-  }
-
-  function getJSON(element, url, success) {
-    $.ajax({
-      dataType: "json",
-      url: url,
-      success: success,
-      error: function(jqXHR, textStatus, errorThrown) {
-        var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message;
-        chartError(element, message);
-      }
-    });
-  }
-
-  function errorCatcher(element, data, opts, callback) {
-    try {
-      callback(element, data, opts);
-    } catch (err) {
-      chartError(element, err.message);
-      throw err;
-    }
-  }
-
-  function fetchDataSource(element, dataSource, opts, callback) {
-    if (typeof dataSource === "string") {
-      getJSON(element, dataSource, function(data, textStatus, jqXHR) {
-        errorCatcher(element, data, opts, callback);
-      });
-    } else {
-      errorCatcher(element, dataSource, opts, callback);
-    }
-  }
-
-  // type conversions
-
-  function toStr(n) {
-    return "" + n;
-  }
-
-  function toFloat(n) {
-    return parseFloat(n);
-  }
-
-  function toDate(n) {
-    if (typeof n !== "object") {
-      if (typeof n === "number") {
-        n = new Date(n * 1000); // ms
-      } else { // str
-        // try our best to get the str into iso8601
-        // TODO be smarter about this
-        var str = n.replace(/ /, "T").replace(" ", "").replace("UTC", "Z");
-        n = parseISO8601(str) || new Date(n);
-      }
-    }
-    return n;
-  }
-
-  function toArr(n) {
-    if (!isArray(n)) {
-      var arr = [], i;
-      for (i in n) {
-        if (n.hasOwnProperty(i)) {
-          arr.push([i, n[i]]);
-        }
-      }
-      n = arr;
-    }
-    return n;
-  }
-
   // process data
 
-  function sortByTime(a, b) {
-    return a[0].getTime() - b[0].getTime();
-  }
-
   function processSeries(series, opts, time) {
     var i, j, data, r, key;
 
@@ -635,23 +644,23 @@
 
   // define classes
 
-  var Chartkick = {
-    LineChart: function(element, dataSource, opts) {
+  Chartkick = {
+    LineChart: function (element, dataSource, opts) {
       setElement(element, dataSource, opts, processLineData);
     },
-    PieChart: function(element, dataSource, opts) {
+    PieChart: function (element, dataSource, opts) {
       setElement(element, dataSource, opts, processPieData);
     },
-    ColumnChart: function(element, dataSource, opts) {
+    ColumnChart: function (element, dataSource, opts) {
       setElement(element, dataSource, opts, processColumnData);
     },
-    BarChart: function(element, dataSource, opts) {
+    BarChart: function (element, dataSource, opts) {
       setElement(element, dataSource, opts, processBarData);
     },
-    AreaChart: function(element, dataSource, opts) {
+    AreaChart: function (element, dataSource, opts) {
       setElement(element, dataSource, opts, processAreaData);
     }
   };
 
   window.Chartkick = Chartkick;
-})();
+}());

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

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