chartkick 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46ec92735ba9997a65a29ad80eb469d3941dc2a
-  data.tar.gz: cf59f724aa203cb7cc3fd3fad78691ffc783632e
+  metadata.gz: 4a12b7c456c1629ffea1a3a0e24c3d04570976df
+  data.tar.gz: e95c19db240c947706b9e7cada5d801a01f7816f
 SHA512:
-  metadata.gz: 6ec3ca205f0fab3202b92603abb226a92a4304476bc40d8d0776ce523f254ec9f8a8c6f031f3fb212e85668c42e08c775f20b9b31580500e976aacc3c7c6f0b9
-  data.tar.gz: 4b9828b60562e2bb5a1f15ff6a770aa1eca7aaef418e6dffa1beee5e1bab5e21fc43a787640b7db7a718437ec4107097eff36942188fd7c6f73309fed447843a
+  metadata.gz: 1607fb1576ad4245e735590dc7de1aa305c51b19b5bdefaebc42e7b9a860be1804da044cb8c2ac46fa18a3e4327946b0235ed5b2fd0fac9b004707c01e4870eb
+  data.tar.gz: 7a24d02544deff043efc1f7cb9fa4e51611393620bdee646e1b6b554c8941774bd8e1cca0fe98a825a4aa80c23b5ceed61357c8e03492a5e936272b4185149cf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.4
+
+- Added compatibility with Rails API
+- Updated Chartkick.js to 2.2.4
+
 ## 2.2.3
 
 - Updated Chartkick.js to 2.2.3

data/app/assets/javascripts/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful charts with one line of JavaScript
  * https://github.com/ankane/chartkick.js
- * v2.2.3
+ * v2.2.4
  * MIT License
  */
 
@@ -569,17 +569,22 @@
 
           options.xAxis.categories = categories;
 
-          var newSeries = [];
+          var newSeries = [], d2;
           for (i = 0; i < series.length; i++) {
             d = [];
             for (j = 0; j < categories.length; j++) {
               d.push(rows[categories[j]][i] || 0);
             }
 
-            newSeries.push({
+            d2 = {
               name: series[i].name,
               data: d
-            });
+            }
+            if (series[i].stack) {
+              d2.stack = series[i].stack;
+            }
+
+            newSeries.push(d2);
           }
           options.series = newSeries;
 
@@ -1058,7 +1063,7 @@
         var defaultColors = [
           "#3366CC", "#DC3912", "#FF9900", "#109618", "#990099", "#3B3EAC", "#0099C6",
           "#DD4477", "#66AA00", "#B82E2E", "#316395", "#994499", "#22AA99", "#AAAA11",
-          "#6633CC", "#E67300", "#8B0707", "#329262", "#5574A6", "#3B3EAC"
+          "#6633CC", "#E67300", "#8B0707", "#329262", "#5574A6", "#651067"
         ];
 
         var hideLegend = function (options, legend, hideLegend) {
@@ -1237,6 +1242,10 @@
               borderWidth: 2
             };
 
+            if (s.stack) {
+              dataset.stack = s.stack;
+            }
+
             if (chart.options.curve === false) {
               dataset.lineTension = 0;
             }
@@ -1565,6 +1574,22 @@
     return false;
   }
 
+  // creates a shallow copy of each element of the array
+  // elements are expected to be objects
+  function copySeries(series) {
+    var newSeries = [], i, j;
+    for (i = 0; i < series.length; i++) {
+      var copy = {}
+      for (j in series[i]) {
+        if (series[i].hasOwnProperty(j)) {
+          copy[j] = series[i][j];
+        }
+      }
+      newSeries.push(copy)
+    }
+    return newSeries;
+  }
+
   function processSeries(chart, keyType) {
     var i;
 
@@ -1591,6 +1616,7 @@
     }
 
     // right format
+    series = copySeries(series);
     for (i = 0; i < series.length; i++) {
       series[i].data = formatSeriesData(toArr(series[i].data), keyType);
     }
@@ -1702,10 +1728,10 @@
       fetchDataSource(chart, callback, chart.rawData);
     };
     chart.refreshData = function () {
-      if (typeof dataSource === "string") {
+      if (typeof chart.dataSource === "string") {
         // prevent browser from caching
-        var sep = dataSource.indexOf("?") === -1 ? "?" : "&";
-        var url = dataSource + sep + "_=" + (new Date()).getTime();
+        var sep = chart.dataSource.indexOf("?") === -1 ? "?" : "&";
+        var url = chart.dataSource + sep + "_=" + (new Date()).getTime();
         fetchDataSource(chart, callback, url);
       }
     };

data/chartkick.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "chartkick"
   spec.version       = Chartkick::VERSION
   spec.authors       = ["Andrew Kane"]
-  spec.email         = ["acekane1@gmail.com"]
+  spec.email         = ["andrew@chartkick.com"]
   spec.description   = "Create beautiful JavaScript charts with one line of Ruby"
   spec.summary       = "Create beautiful JavaScript charts with one line of Ruby"
   spec.homepage      = "http://chartkick.com"

data/lib/chartkick/engine.rb

@@ -1,11 +1,13 @@
 module Chartkick
   class Engine < ::Rails::Engine
     initializer "precompile", group: :all do |app|
-      if defined?(Sprockets) && Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new("4.0.0.beta1")
-        app.config.assets.precompile << "chartkick.js"
-      else
-        # use a proc instead of a string
-        app.config.assets.precompile << proc { |path| path == "chartkick.js" }
+      if app.config.respond_to?(:assets)
+        if defined?(Sprockets) && Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new("4.0.0.beta1")
+          app.config.assets.precompile << "chartkick.js"
+        else
+          # use a proc instead of a string
+          app.config.assets.precompile << proc { |path| path == "chartkick.js" }
+        end
       end
     end
 

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
 description: Create beautiful JavaScript charts with one line of Ruby
 email:
-- acekane1@gmail.com
+- andrew@chartkick.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Create beautiful JavaScript charts with one line of Ruby