chartist-rails 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da48d66cb4101e6a0b4989cdb25078d08ac5ff3
-  data.tar.gz: 9bdef3c4828e1a2d2be2f090ae79f268f7af5e3a
+  metadata.gz: baa734d47f6a94e18ccf95a67bf02ffc4e063137
+  data.tar.gz: 47b95f795fb34402f81f29dc9965621a8805cd1a
 SHA512:
-  metadata.gz: 951ca14c5626948a3be16b37867894882d67307c1493bffb840be7ff9776fabe2b54bd7d24b878e194e2c4715e2e15b4f587b8512d6b074c3cdce8202d442993
-  data.tar.gz: bfc52094a576adc8b2600552801c647fb9d8373639c69732eb114733fc757a98ae928a52171e123433de060c5e8c0c249078f1b7bb30c6a0e8f7d0220086893d
+  metadata.gz: 5934347b5d3811cb604a449f7e2dac2a09dced09b8685de615bbc50ad9401b093b097b71a6833e33fecdeb968831f97f1f1acce8463d8c0ffaf418b330ce79fa
+  data.tar.gz: 85b27ebe26c04aece2aa28995a96740b13dcf3b7b9f354a564de4274daa98962b1d550832991bc2e359ef029cb166c4bc3aaec0493f134ad7eda59fb8ef78bd4

data/README.md

@@ -1,6 +1,6 @@
 # Chartist::Rails
 
-This gem is a wrapper for the [Charist.js](https://github.com/gionkunz/chartist-js) library (v0.9.5).
+This gem is a wrapper for the [Charist.js](https://github.com/gionkunz/chartist-js) library (v0.9.7).
 The state of this gem is that it is fully functional, but you can not change the settings yet.
 I am currently working on a generator so that you can customize the settings file to your liking.
 

data/chartist-rails.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["AnthonyBobsin"]
   spec.email         = ["bobsinj@gmail.com"]
   spec.summary       = %q{Vendors the Chartist.js library for use with the Rail's assets pipeline.}
-  spec.description   = %q{Current using Chartist version 0.9.5}
+  spec.description   = %q{Current using Chartist version 0.9.7}
   spec.homepage      = "https://github.com/AnthonyBobsin/chartist-rails"
   spec.license       = "MIT"
 

data/lib/chartist-rails/version.rb

@@ -1,5 +1,5 @@
 module Chartist
   module Rails
-    VERSION = "0.9.5"
+    VERSION = "0.9.7"
   end
 end

data/vendor/assets/javascripts/chartist.js

@@ -14,10 +14,11 @@
   }
 }(this, function () {
 
-/* Chartist.js 0.9.5
- * Copyright © 2015 Gion Kunz
- * Free to use under the WTFPL license.
- * http://www.wtfpl.net/
+/* Chartist.js 0.9.7
+ * Copyright © 2016 Gion Kunz
+ * Free to use under either the WTFPL license or the MIT license.
+ * https://raw.githubusercontent.com/gionkunz/chartist-js/master/LICENSE-WTFPL
+ * https://raw.githubusercontent.com/gionkunz/chartist-js/master/LICENSE-MIT
  */
 /**
  * The core module of Chartist that is mainly providing static functions and higher level functions for chart modules.
@@ -25,12 +26,26 @@
  * @module Chartist.Core
  */
 var Chartist = {
-  version: '0.9.5'
+  version: '0.9.7'
 };
 
 (function (window, document, Chartist) {
   'use strict';
 
+  /**
+   * This object contains all namespaces used within Chartist.
+   *
+   * @memberof Chartist.Core
+   * @type {{svg: string, xmlns: string, xhtml: string, xlink: string, ct: string}}
+   */
+  Chartist.namespaces = {
+    svg: 'http://www.w3.org/2000/svg',
+    xmlns: 'http://www.w3.org/2000/xmlns/',
+    xhtml: 'http://www.w3.org/1999/xhtml',
+    xlink: 'http://www.w3.org/1999/xlink',
+    ct: 'http://gionkunz.github.com/chartist-js/ct'
+  };
+
   /**
    * Helps to simplify functional style code
    *
@@ -311,7 +326,7 @@ var Chartist = {
     // Check if there is a previous SVG element in the container that contains the Chartist XML namespace and remove it
     // Since the DOM API does not support namespaces we need to manually search the returned list http://www.w3.org/TR/selectors-api/
     Array.prototype.slice.call(container.querySelectorAll('svg')).filter(function filterChartistSvgObjects(svg) {
-      return svg.getAttributeNS('http://www.w3.org/2000/xmlns/', Chartist.xmlNs.prefix);
+      return svg.getAttributeNS(Chartist.namespaces.xmlns, 'ct');
     }).forEach(function removePreviousElement(svg) {
       container.removeChild(svg);
     });
@@ -330,6 +345,44 @@ var Chartist = {
     return svg;
   };
 
+  /**
+   * Ensures that the data object passed as second argument to the charts is present and correctly initialized.
+   *
+   * @param  {Object} data The data object that is passed as second argument to the charts
+   * @return {Object} The normalized data object
+   */
+  Chartist.normalizeData = function(data) {
+    // Ensure data is present otherwise enforce
+    data = data || {series: [], labels: []};
+    data.series = data.series || [];
+    data.labels = data.labels || [];
+
+    // Check if we should generate some labels based on existing series data
+    if (data.series.length > 0 && data.labels.length === 0) {
+      var normalized = Chartist.getDataArray(data),
+          labelCount;
+
+      // If all elements of the normalized data array are arrays we're dealing with
+      // data from Bar or Line charts and we need to find the largest series if they are un-even
+      if (normalized.every(function(value) {
+        return value instanceof Array;
+      })) {
+        // Getting the series with the the most elements
+        labelCount = Math.max.apply(null, normalized.map(function(series) {
+          return series.length;
+        }));
+      } else {
+        // We're dealing with Pie data so we just take the normalized array length
+        labelCount = normalized.length;
+      }
+
+      // Setting labels to an array with emptry strings using our labelCount estimated above
+      data.labels = Chartist.times(labelCount).map(function() {
+        return '';
+      });
+    }
+    return data;
+  };
 
   /**
    * Reverses the series, labels and series data arrays.
@@ -532,9 +585,13 @@ var Chartist = {
       } else if (highLow.low < 0) {
         // If we have the same negative value for the bounds we set bounds.high to 0
         highLow.high = 0;
-      } else {
+      } else if (highLow.high > 0) {
         // If we have the same positive value for the bounds we set bounds.low to 0
         highLow.low = 0;
+      } else {
+        // If data array was empty, values are Number.MAX_VALUE and -Number.MAX_VALUE. Set bounds to prevent errors
+        highLow.high = 1;
+        highLow.low = 0;
       }
     }
 
@@ -1158,10 +1215,13 @@ var Chartist = {
       // This is necessary to treat "holes" in line charts
       var segments = splitIntoSegments(pathCoordinates, valueData);
 
-      // If the split resulted in more that one segment we need to interpolate each segment individually and join them
-      // afterwards together into a single path.
-      if(segments.length > 1) {
-        var paths = [];
+      if(!segments.length) {
+        // If there were no segments return 'Chartist.Interpolation.none'
+        return Chartist.Interpolation.none()([]);
+      } else if(segments.length > 1) {
+        // If the split resulted in more that one segment we need to interpolate each segment individually and join them
+        // afterwards together into a single path.
+          var paths = [];
         // For each segment we will recurse the cardinal function
         segments.forEach(function(segment) {
           paths.push(cardinal(segment.pathCoordinates, segment.valueData));
@@ -1677,16 +1737,6 @@ var Chartist = {
 (function(window, document, Chartist) {
   'use strict';
 
-  var svgNs = 'http://www.w3.org/2000/svg',
-    xmlNs = 'http://www.w3.org/2000/xmlns/',
-    xhtmlNs = 'http://www.w3.org/1999/xhtml';
-
-  Chartist.xmlNs = {
-    qualifiedName: 'xmlns:ct',
-    prefix: 'ct',
-    uri: 'http://gionkunz.github.com/chartist-js/ct'
-  };
-
   /**
    * Chartist.Svg creates a new SVG object wrapper with a starting element. You can use the wrapper to fluently create sub-elements and modify them.
    *
@@ -1703,11 +1753,13 @@ var Chartist = {
     if(name instanceof Element) {
       this._node = name;
     } else {
-      this._node = document.createElementNS(svgNs, name);
+      this._node = document.createElementNS(Chartist.namespaces.svg, name);
 
       // If this is an SVG element created then custom namespace
       if(name === 'svg') {
-        this._node.setAttributeNS(xmlNs, Chartist.xmlNs.qualifiedName, Chartist.xmlNs.uri);
+        this.attr({
+          'xmlns:ct': Chartist.namespaces.ct
+        });
       }
     }
 
@@ -1733,7 +1785,7 @@ var Chartist = {
    *
    * @memberof Chartist.Svg
    * @param {Object|String} attributes An object with properties that will be added as attributes to the SVG element that is created. Attributes with undefined values will not be added. If this parameter is a String then the function is used as a getter and will return the attribute value.
-   * @param {String} ns If specified, the attributes will be set as namespace attributes with ns as prefix.
+   * @param {String} ns If specified, the attribute will be obtained using getAttributeNs. In order to write namepsaced attributes you can use the namespace:attribute notation within the attributes object.
    * @return {Object|String} The current wrapper object will be returned so it can be used for chaining or the attribute value if used as getter function.
    */
   function attr(attributes, ns) {
@@ -1751,8 +1803,9 @@ var Chartist = {
         return;
       }
 
-      if(ns) {
-        this._node.setAttributeNS(ns, [Chartist.xmlNs.prefix, ':', key].join(''), attributes[key]);
+      if (key.indexOf(':') !== -1) {
+        var namespacedAttribute = key.split(':');
+        this._node.setAttributeNS(Chartist.namespaces[namespacedAttribute[0]], key, attributes[key]);
       } else {
         this._node.setAttribute(key, attributes[key]);
       }
@@ -1843,7 +1896,7 @@ var Chartist = {
     }
 
     // Adding namespace to content element
-    content.setAttribute('xmlns', xhtmlNs);
+    content.setAttribute('xmlns', Chartist.namespaces.xmlns);
 
     // Creating the foreignObject without required extension attribute (as described here
     // http://www.w3.org/TR/SVG/extend.html#ForeignObjectElement)
@@ -1981,43 +2034,23 @@ var Chartist = {
   }
 
   /**
-   * "Save" way to get property value from svg BoundingBox.
-   * This is a workaround. Firefox throws an NS_ERROR_FAILURE error if getBBox() is called on an invisible node.
-   * See [NS_ERROR_FAILURE: Component returned failure code: 0x80004005](http://jsfiddle.net/sym3tri/kWWDK/)
-   *
-   * @memberof Chartist.Svg
-   * @param {SVGElement} node The svg node to
-   * @param {String} prop The property to fetch (ex.: height, width, ...)
-   * @returns {Number} The value of the given bbox property
-   */
-  function getBBoxProperty(node, prop) {
-    try {
-      return node.getBBox()[prop];
-    } catch(e) {}
-
-    return 0;
-  }
-
-  /**
-   * Get element height with fallback to svg BoundingBox or parent container dimensions:
-   * See [bugzilla.mozilla.org](https://bugzilla.mozilla.org/show_bug.cgi?id=530985)
+   * Get element height using `getBoundingClientRect`
    *
    * @memberof Chartist.Svg
    * @return {Number} The elements height in pixels
    */
   function height() {
-    return this._node.clientHeight || Math.round(getBBoxProperty(this._node, 'height')) || this._node.parentNode.clientHeight;
+    return this._node.getBoundingClientRect().height;
   }
 
   /**
-   * Get element width with fallback to svg BoundingBox or parent container dimensions:
-   * See [bugzilla.mozilla.org](https://bugzilla.mozilla.org/show_bug.cgi?id=530985)
+   * Get element width using `getBoundingClientRect`
    *
    * @memberof Chartist.Core
    * @return {Number} The elements width in pixels
    */
   function width() {
-    return this._node.clientWidth || Math.round(getBBoxProperty(this._node, 'width')) || this._node.parentNode.clientWidth;
+    return this._node.getBoundingClientRect().width;
   }
 
   /**
@@ -2725,7 +2758,7 @@ var Chartist = {
       }
 
       // Skip grid lines and labels where interpolated label values are falsey (execpt for 0)
-      if(!labelValues[index] && labelValues[index] !== 0) {
+      if(Chartist.isFalseyButZero(labelValues[index]) && labelValues[index] !== '') {
         return;
       }
 
@@ -3042,6 +3075,7 @@ var Chartist = {
    *
    */
   function createChart(options) {
+    this.data = Chartist.normalizeData(this.data);
     var data = {
       raw: this.data,
       normalized: Chartist.getDataArray(this.data, options.reverseData, true)
@@ -3084,9 +3118,9 @@ var Chartist = {
 
       // Write attributes to series group element. If series name or meta is undefined the attributes will not be written
       seriesElement.attr({
-        'series-name': series.name,
-        'meta': Chartist.serialize(series.meta)
-      }, Chartist.xmlNs.uri);
+        'ct:series-name': series.name,
+        'ct:meta': Chartist.serialize(series.meta)
+      });
 
       // Use series class from series data or if not set generate one
       seriesElement.addClass([
@@ -3136,11 +3170,9 @@ var Chartist = {
             x2: pathElement.x + 0.01,
             y2: pathElement.y
           }, options.classNames.point).attr({
-            'value': [pathElement.data.value.x, pathElement.data.value.y].filter(function(v) {
-                return v;
-              }).join(','),
-            'meta': pathElement.data.meta
-          }, Chartist.xmlNs.uri);
+            'ct:value': [pathElement.data.value.x, pathElement.data.value.y].filter(Chartist.isNum).join(','),
+            'ct:meta': pathElement.data.meta
+          });
 
           this.eventEmitter.emit('draw', {
             type: 'point',
@@ -3214,9 +3246,7 @@ var Chartist = {
           // and adding the created DOM elements to the correct series group
           var area = seriesElement.elem('path', {
             d: areaPath.stringify()
-          }, options.classNames.area, true).attr({
-            'values': data.normalized[seriesIndex]
-          }, Chartist.xmlNs.uri);
+          }, options.classNames.area, true);
 
           // Emit an event for each area that was drawn
           this.eventEmitter.emit('draw', {
@@ -3302,7 +3332,7 @@ var Chartist = {
    *   ]
    * };
    *
-   * // In adition to the regular options we specify responsive option overrides that will override the default configutation based on the matching media queries.
+   * // In addition to the regular options we specify responsive option overrides that will override the default configutation based on the matching media queries.
    * var responsiveOptions = [
    *   ['screen and (min-width: 641px) and (max-width: 1024px)', {
    *     showPoint: false,
@@ -3410,8 +3440,6 @@ var Chartist = {
     high: undefined,
     // Overriding the natural low of the chart allows you to zoom in or limit the charts lowest displayed value
     low: undefined,
-    // Use only integer values (whole numbers) for the scale steps
-    onlyInteger: false,
     // Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
     chartPadding: {
       top: 15,
@@ -3454,6 +3482,7 @@ var Chartist = {
    *
    */
   function createChart(options) {
+    this.data = Chartist.normalizeData(this.data);
     var data = {
       raw: this.data,
       normalized: options.distributeSeries ? Chartist.getDataArray(this.data, options.reverseData, options.horizontalBars ? 'x' : 'y').map(function(value) {
@@ -3476,15 +3505,15 @@ var Chartist = {
     var seriesGroup = this.svg.elem('g');
     var labelGroup = this.svg.elem('g').addClass(options.classNames.labelGroup);
 
-    if(options.stackBars) {
+    if(options.stackBars && data.normalized.length !== 0) {
       // If stacked bars we need to calculate the high low from stacked values from each series
       var serialSums = Chartist.serialMap(data.normalized, function serialSums() {
         return Array.prototype.slice.call(arguments).map(function(value) {
           return value;
         }).reduce(function(prev, curr) {
           return {
-            x: prev.x + curr.x || 0,
-            y: prev.y + curr.y || 0
+            x: prev.x + (curr && curr.x) || 0,
+            y: prev.y + (curr && curr.y) || 0
           };
         }, {x: 0, y: 0});
       });
@@ -3600,9 +3629,9 @@ var Chartist = {
 
       // Write attributes to series group element. If series name or meta is undefined the attributes will not be written
       seriesElement.attr({
-        'series-name': series.name,
-        'meta': Chartist.serialize(series.meta)
-      }, Chartist.xmlNs.uri);
+        'ct:series-name': series.name,
+        'ct:meta': Chartist.serialize(series.meta)
+      });
 
       // Use series class from series data or if not set generate one
       seriesElement.addClass([
@@ -3691,11 +3720,9 @@ var Chartist = {
 
         // Create bar element
         bar = seriesElement.elem('line', positions, options.classNames.bar).attr({
-          'value': [value.x, value.y].filter(function(v) {
-            return v;
-          }).join(','),
-          'meta': Chartist.getMetaData(series, valueIndex)
-        }, Chartist.xmlNs.uri);
+          'ct:value': [value.x, value.y].filter(Chartist.isNum).join(','),
+          'ct:meta': Chartist.getMetaData(series, valueIndex)
+        });
 
         this.eventEmitter.emit('draw', Chartist.extend({
           type: 'bar',
@@ -3826,7 +3853,9 @@ var Chartist = {
     // Label direction can be 'neutral', 'explode' or 'implode'. The labels anchor will be positioned based on those settings as well as the fact if the labels are on the right or left side of the center of the chart. Usually explode is useful when labels are positioned far away from the center.
     labelDirection: 'neutral',
     // If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
-    reverseData: false
+    reverseData: false,
+    // If true empty values will be ignored to avoid drawing unncessary slices and labels
+    ignoreEmptyValues: false
   };
 
   /**
@@ -3857,6 +3886,7 @@ var Chartist = {
    * @param options
    */
   function createChart(options) {
+    this.data = Chartist.normalizeData(this.data);
     var seriesGroups = [],
       labelsGroup,
       chartRect,
@@ -3921,13 +3951,16 @@ var Chartist = {
     // Draw the series
     // initialize series groups
     for (var i = 0; i < this.data.series.length; i++) {
+      // If current value is zero and we are ignoring empty values then skip to next value
+      if (dataArray[i] === 0 && options.ignoreEmptyValues) continue;
+
       var series = this.data.series[i];
       seriesGroups[i] = this.svg.elem('g', null, null, true);
 
       // If the series is an object and contains a name or meta data we add a custom attribute
       seriesGroups[i].attr({
-        'series-name': series.name
-      }, Chartist.xmlNs.uri);
+        'ct:series-name': series.name
+      });
 
       // Use series class from series data or if not set generate one
       seriesGroups[i].addClass([
@@ -3936,13 +3969,17 @@ var Chartist = {
       ].join(' '));
 
       var endAngle = startAngle + dataArray[i] / totalDataSum * 360;
+
+      // Use slight offset so there are no transparent hairline issues
+      var overlappigStartAngle = Math.max(0, startAngle - (i === 0 || hasSingleValInSeries ? 0 : 0.2));
+
       // If we need to draw the arc for all 360 degrees we need to add a hack where we close the circle
       // with Z and use 359.99 degrees
-      if(endAngle - startAngle === 360) {
-        endAngle -= 0.01;
+      if(endAngle - overlappigStartAngle >= 359.99) {
+        endAngle = overlappigStartAngle + 359.99;
       }
 
-      var start = Chartist.polarToCartesian(center.x, center.y, radius, startAngle - (i === 0 || hasSingleValInSeries ? 0 : 0.2)),
+      var start = Chartist.polarToCartesian(center.x, center.y, radius, overlappigStartAngle),
         end = Chartist.polarToCartesian(center.x, center.y, radius, endAngle);
 
       // Create a new path element for the pie chart. If this isn't a donut chart we should close the path for a correct stroke
@@ -3963,9 +4000,9 @@ var Chartist = {
 
       // Adding the pie series value to the path
       pathElement.attr({
-        'value': dataArray[i],
-        'meta': Chartist.serialize(series.meta)
-      }, Chartist.xmlNs.uri);
+        'ct:value': dataArray[i],
+        'ct:meta': Chartist.serialize(series.meta)
+      });
 
       // If this is a donut, we add the stroke-width as style attribute
       if(options.donut) {
@@ -3995,7 +4032,7 @@ var Chartist = {
       if(options.showLabel) {
         // Position at the labelRadius distance from center and between start and end angle
         var labelPosition = Chartist.polarToCartesian(center.x, center.y, labelRadius, startAngle + (endAngle - startAngle) / 2),
-          interpolatedValue = options.labelInterpolationFnc(this.data.labels ? this.data.labels[i] : dataArray[i], i);
+          interpolatedValue = options.labelInterpolationFnc(this.data.labels && !Chartist.isFalseyButZero(this.data.labels[i]) ? this.data.labels[i] : dataArray[i], i);
 
         if(interpolatedValue || interpolatedValue === 0) {
           var labelElement = labelsGroup.elem('text', {
@@ -4017,7 +4054,7 @@ var Chartist = {
         }
       }
 
-      // Set next startAngle to current endAngle. Use slight offset so there are no transparent hairline issues
+      // Set next startAngle to current endAngle.
       // (except for last slice)
       startAngle = endAngle;
     }