chartkick 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66237e187aaf3b68447fd5e033088607e9b27e70
-  data.tar.gz: fb2adba85238880690bb7316e8129f0636e27371
+  metadata.gz: b5427cbb9ac6410183b5b75d934a86401f44edcf
+  data.tar.gz: ba02320221736a07ac93952fddfb9f2009de9116
 SHA512:
-  metadata.gz: 983f8b225d6ab4b1d4a96a7a10e7f77435159b63c2dc7ca61a632dfce77cd22395472f4bbd76d5d2b499329f0d832238c069238dc5adbb703aeb7a08e04b1c35
-  data.tar.gz: dfdf35ea722f1be79d0562ca54289489b48ab72f7351c78f2190570a1642deb0e275e3c87c8560d9f74c46af3cbc6a604939e2d1a42ee2460f05d5a0e630e76c
+  metadata.gz: 2b6fc819285107bf34dd80c1bde51a893be46ebf32bf4caed959c9e341ade192e9158fdb9d7946124349152e9e933f2b708fd803373bcd49a8db5f3214fd14ad
+  data.tar.gz: f6b741b21283906af8017217cb92e41a7abff4da91fe267d4d29ed467265516ae0808b00bfab23b658be8a6f6d0b535ff56eef129a7c1e597cbe8f8122a4375f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1
+
+Updated chartkick.js to v1.0.1
+
 ## 1.0.0
 
 - Use semantic versioning (no changes)

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.0.0
+ * v1.0.1
  * MIT License
  */
 
@@ -182,7 +182,7 @@
     renderLineChart = function(element, series, opts) {
       var options = jsOptions(series, opts), data, i, j;
       options.xAxis.type = "datetime";
-      options.chart = {type: "spline"};
+      options.chart = {type: "spline", renderTo: element.id};
 
       for (i = 0; i < series.length; i++) {
         data = series[i].data;
@@ -192,22 +192,23 @@
         series[i].marker = {symbol: "circle"};
       }
       options.series = series;
-      $(element).highcharts(options);
+      new Highcharts.Chart(options);
     };
 
     renderPieChart = function(element, series, opts) {
       var options = clone(defaultOptions);
+      options.chart = {renderTo: element.id};
       options.series = [{
         type: "pie",
         name: "Value",
         data: series
       }];
-      $(element).highcharts(options);
+      new Highcharts.Chart(options);
     };
 
     renderColumnChart = function(element, series, opts) {
       var options = jsOptions(series, opts), i, j, s, d, rows = [];
-      options.chart = {type: "column"};
+      options.chart = {type: "column", renderTo: element.id};
 
       for (i = 0; i < series.length; i++) {
         s = series[i];
@@ -243,7 +244,7 @@
       }
       options.series = newSeries;
 
-      $(element).highcharts(options);
+      new Highcharts.Chart(options);
     };
   } else if ("google" in window) { // Google charts
     // load from google
@@ -313,6 +314,10 @@
 
     var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
 
+    var sortByNumber = function(a, b) {
+      return a[0] - b[0];
+    };
+
     // cant use object as key
     var createDataTable = function(series, columnType) {
       var data = new google.visualization.DataTable();
@@ -339,6 +344,9 @@
           rows2.push([(columnType === "datetime") ? new Date(toFloat(i)) : i].concat(rows[i]));
         }
       }
+      if (columnType === "datetime") {
+        rows2.sort(sortByNumber);
+      }
       data.addRows(rows2);
 
       return data;
@@ -485,8 +493,7 @@
     if (!isArray(series) || typeof series[0] !== "object" || isArray(series[0])) {
       series = [{name: "Value", data: series}];
       opts.hideLegend = true;
-    }
-    else {
+    } else {
       opts.hideLegend = false;
     }
 

data/lib/chartkick/helper.rb

@@ -22,12 +22,13 @@ module Chartkick
       height = options.delete(:height) || "300px"
 
       # don't quote font-family names due to rails escaping
-      html = content_tag :div, :id => element_id, :style => "height: #{height}; text-align: center; color: #999; line-height: #{height}; font-size: 14px; font-family: Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif;" do
+      div_tag = content_tag :div, :id => element_id, :style => "height: #{height}; text-align: center; color: #999; line-height: #{height}; font-size: 14px; font-family: Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif;" do
         concat "Loading..."
       end
-      html += javascript_tag do
+      script_tag = javascript_tag do
         concat "new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.to_json}, #{options.to_json});".html_safe
       end
+      div_tag + script_tag
     end
 
   end

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties