highcharts-js-rails 0.1.9 → 0.1.10

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.1.10 (2012-09-06) ##
+
+* Update Highcharts to 2.3.2.
+* Take new parts of the API into account:
+  * PlotOptions for arearange, areasplinerange, columnrange, and gauge.
+
 ## v0.1.9 (2012-06-21) ##
 
 * Update Highcharts to 2.2.5.

data/highcharts-js-rails.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'highcharts-js-rails'
-  s.version     = '0.1.9'
+  s.version     = '0.1.10'
   s.authors     = ['Alex Robbin']
   s.email       = ['agrobbin@gmail.com']
   s.homepage    = 'https://github.com/agrobbin/highcharts-js-rails'

data/lib/highcharts/plot_options/plot_type.rb

@@ -5,8 +5,10 @@ class Highcharts
       def initialize(opts = {})
         @suboptions = {
           :dataLabels => 'Labels',
+          :dial => 'Base',
           :events => 'PlotOptions::PlotType::Events',
           :marker => 'PlotOptions::PlotType::Marker',
+          :pivot => 'Base',
           :point => 'Point',
           :states => 'PlotOptions::PlotType::States'
         }

data/lib/highcharts/plot_options.rb

@@ -4,9 +4,13 @@ class Highcharts
     def initialize(opts = {})
       @suboptions = {
         :area => 'PlotOptions::PlotType',
+        :arearange => 'PlotOptions::PlotType',
         :areaspline => 'PlotOptions::PlotType',
+        :areasplinerange => 'PlotOptions::PlotType',
         :bar => 'PlotOptions::PlotType',
         :column => 'PlotOptions::PlotType',
+        :columnrange => 'PlotOptions::PlotType',
+        :gauge => 'PlotOptions::PlotType',
         :line => 'PlotOptions::PlotType',
         :pie => 'PlotOptions::PlotType',
         :series => 'PlotOptions::PlotType',

data/vendor/assets/javascripts/highcharts/adapters/mootools.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v2.2.5 (2012-06-08)
+ * @license Highcharts JS v2.3.2 (2012-08-31)
  * MooTools adapter
  *
  * (c) 2010-2011 Torstein Hønsi
@@ -78,8 +78,9 @@ win.HighchartsAdapter = {
 		
 		// This currently works for getting inner width and height. If adding
 		// more methods later, we need a conditional implementation for each.
-		return $(el).getStyle(method).toInt();
-		
+		if (method === 'width' || method === 'height') {
+			return parseInt($(el).getStyle(method), 10);
+		}
 	},
 
 	/**
@@ -181,6 +182,13 @@ win.HighchartsAdapter = {
 	grep: function (arr, fn) {
 		return arr.filter(fn);
 	},
+	
+	/**
+	 * Return the index of an item in an array, or -1 if not matched
+	 */
+	inArray: function (item, arr, from) {
+		return arr.indexOf(item, from);
+	},
 
 	/**
 	 * Deep merge two objects and return a third
@@ -303,9 +311,7 @@ win.HighchartsAdapter = {
 	 * Set back e.pageX and e.pageY that MooTools has abstracted away
 	 */
 	washMouseEvent: function (e) {
-		e.pageX = e.page.x;
-		e.pageY = e.page.y;
-		return e;
+		return e.event || e;
 	},
 
 	/**

data/vendor/assets/javascripts/highcharts/adapters/prototype.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v2.2.5 (2012-06-08)
+ * @license Highcharts JS v2.3.2 (2012-08-31)
  * Prototype adapter
  *
  * @author Michael Nelson, Torstein Hønsi.
@@ -200,6 +200,10 @@ return {
 	each: function (arr, fn) {
 		$A(arr).each(fn);
 	},
+	
+	inArray: function (item, arr) {
+		return arr.indexOf(item);
+	},
 
 	/**
 	 * Get the cumulative offset relative to the top left of the page. This method, unlike its

data/vendor/assets/javascripts/highcharts/modules/canvas-tools.js

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v2.2.5 (2012-06-08)
+ * @license Highcharts JS v2.3.2 (2012-08-31)
  * CanVGRenderer Extension module
  *
  * (c) 2011-2012 Torstein Hønsi, Erik Olsson

data/vendor/assets/javascripts/highcharts/modules/data.js

@@ -0,0 +1,277 @@
+/**
+ * @license Data plugin for Highcharts v0.1
+ *
+ * (c) 2012 Torstein Hønsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*
+ * Demo: http://jsfiddle.net/highcharts/SnLFj/
+ */
+
+(function (Highcharts) {	
+	
+	// Utilities
+	var each = Highcharts.each;
+	
+	
+	// The Data constructor
+	var Data = function (options) {
+		this.init(options);
+	};
+	
+	// Set the prototype properties
+	Highcharts.extend(Data.prototype, {
+		
+	/**
+	 * Initialize the Data object with the given options
+	 */
+	init: function (options) {
+		this.options = options;
+		this.columns = [];
+		
+		
+		// Parse a CSV string if options.csv is given
+		this.parseCSV();
+		
+		// Parse a HTML table if options.table is given
+		this.parseTable();
+		
+		// Interpret the values into right types
+		this.parseTypes();
+		
+		// Use first row for series names?
+		this.findHeaderRow();
+		
+		// Handle columns if a handleColumns callback is given
+		this.parsed();
+		
+		// Complete if a complete callback is given
+		this.complete();
+		
+	},
+	
+	/**
+	 * Parse a CSV input string
+	 */
+	parseCSV: function () {
+		var options = this.options,
+			csv = options.csv,
+			columns = this.columns,
+			startRow = options.startRow || 0,
+			endRow = options.endRow || Number.MAX_VALUE,
+			startColumn = options.startColumn || 0,
+			endColumn = options.endColumn || Number.MAX_VALUE,
+			lines;
+			
+		if (csv) {
+			lines = csv.split(options.lineDelimiter || '\n');
+			
+			each(lines, function (line, rowNo) {
+				if (rowNo >= startRow && rowNo <= endRow) {
+					var items = line.split(options.itemDelimiter || ',');
+					each(items, function (item, colNo) {
+						if (colNo >= startColumn && colNo <= endColumn) {
+							if (!columns[colNo - startColumn]) {
+								columns[colNo - startColumn] = [];					
+							}
+							
+							columns[colNo - startColumn][rowNo - startRow] = item;
+						}
+					});
+				}
+			});
+		}
+	},
+	
+	/**
+	 * Parse a HTML table
+	 */
+	parseTable: function () {
+		var options = this.options,
+			table = options.table,
+			columns = this.columns,
+			startRow = options.startRow || 0,
+			endRow = options.endRow || Number.MAX_VALUE,
+			startColumn = options.startColumn || 0,
+			endColumn = options.endColumn || Number.MAX_VALUE,
+			colNo;
+			
+		if (table) {
+			
+			if (typeof table === 'string') {
+				table = document.getElementById(table);
+			}
+			
+			each(table.getElementsByTagName('tr'), function (tr, rowNo) {
+				colNo = 0; 
+				if (rowNo >= startRow && rowNo <= endRow) {
+					each(tr.childNodes, function (item) {
+						if ((item.tagName === 'TD' || item.tagName === 'TH') && colNo >= startColumn && colNo <= endColumn) {
+							if (!columns[colNo]) {
+								columns[colNo] = [];					
+							}
+							columns[colNo][rowNo - startRow] = item.innerHTML;
+							
+							colNo += 1;
+						}
+					});
+				}
+			});
+		}
+	},
+	
+	/**
+	 * Find the header row. For now, we just check whether the first row contains
+	 * numbers or strings. Later we could loop down and find the first row with 
+	 * numbers.
+	 */
+	findHeaderRow: function () {
+		var headerRow = 0;
+		each(this.columns, function (column) {
+			if (typeof column[0] !== 'string') {
+				headerRow = null;
+			}
+		});
+		this.headerRow = 0;			
+	},
+	
+	/**
+	 * Trim a string from whitespace
+	 */
+	trim: function (str) {
+		return str.replace(/^\s+|\s+$/g, '');
+	},
+	
+	/**
+	 * Parse numeric cells in to number types and date types in to true dates.
+	 * @param {Object} columns
+	 */
+	parseTypes: function () {
+		var columns = this.columns,
+			col = columns.length, 
+			row,
+			val,
+			floatVal,
+			trimVal,
+			dateVal;
+			
+		while (col--) {
+			row = columns[col].length;
+			while (row--) {
+				val = columns[col][row];
+				floatVal = parseFloat(val);
+				trimVal = this.trim(val);
+				/*jslint eqeq: true*/
+				if (trimVal == floatVal) { // is numeric
+				/*jslint eqeq: false*/
+					columns[col][row] = floatVal;
+					
+					// If the number is greater than milliseconds in a year, assume datetime
+					if (floatVal > 365 * 24 * 3600 * 1000) {
+						columns[col].isDatetime = true;
+					} else {
+						columns[col].isNumeric = true;
+					}					
+				
+				} else { // string, continue to determine if it is a date string or really a string
+					dateVal = Date.parse(val);
+					
+					if (col === 0 && typeof dateVal === 'number' && !isNaN(dateVal)) { // is date
+						columns[col][row] = dateVal;
+						columns[col].isDatetime = true;
+					
+					} else { // string
+						columns[col][row] = trimVal;
+					}
+				}
+				
+			}
+		}		
+	},
+	
+	parsed: function () {
+		if (this.options.parsed) {
+			this.options.parsed.call(this, this.columns);
+		}
+	},
+	
+	/**
+	 * If a complete callback function is provided in the options, interpret the 
+	 * columns into a Highcharts options object.
+	 */
+	complete: function () {
+		
+		var columns = this.columns,
+			hasXData,
+			categories,
+			firstCol,
+			type,
+			options = this.options,
+			series,
+			data,
+			name,
+			i,
+			j;
+			
+		
+		if (options.complete) {
+			
+			// Use first column for X data or categories?
+			if (columns.length > 1) {
+				firstCol = columns.shift();
+				if (this.headerRow === 0) {
+					firstCol.shift(); // remove the first cell
+				}
+				
+				// Use the first column for categories or X values
+				hasXData = firstCol.isNumeric || firstCol.isDatetime;
+				if (!hasXData) { // means type is neither datetime nor linear
+					categories = firstCol;
+				}
+				
+				if (firstCol.isDatetime) {
+					type = 'datetime';
+				}
+			}
+			
+			// Use the next columns for series
+			series = [];
+			for (i = 0; i < columns.length; i++) {
+				if (this.headerRow === 0) {
+					name = columns[i].shift();
+				}
+				data = [];
+				for (j = 0; j < columns[i].length; j++) {
+					data[j] = columns[i][j] !== undefined ?
+						(hasXData ?
+							[firstCol[j], columns[i][j]] :
+							columns[i][j]
+						) :
+						null;
+				}
+				series[i] = {
+					name: name,
+					data: data
+				};
+			}
+			
+			// Do the callback
+			options.complete({
+				xAxis: {
+					categories: categories,
+					type: type
+				},
+				series: series
+			});
+		}
+	}
+	});
+	
+	// Register the Data prototype and data function on Highcharts
+	Highcharts.Data = Data;
+	Highcharts.data = function (options) {
+		return new Data(options);
+	};
+}(Highcharts));

data/vendor/assets/javascripts/highcharts/modules/exporting.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v2.2.5 (2012-06-08)
+ * @license Highcharts JS v2.3.2 (2012-08-31)
  * Exporting module
  *
  * (c) 2010-2011 Torstein Hønsi

data/vendor/assets/javascripts/highcharts/themes/dark-blue.js

@@ -8,7 +8,7 @@ Highcharts.theme = {
 		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
 	chart: {
 		backgroundColor: {
-			linearGradient: [0, 0, 250, 500],
+			linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
 			stops: [
 				[0, 'rgb(48, 48, 96)'],
 				[1, 'rgb(0, 0, 0)']
@@ -133,7 +133,7 @@ Highcharts.theme = {
 	navigation: {
 		buttonOptions: {
 			backgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#606060'],
 					[0.6, '#333333']
@@ -160,7 +160,7 @@ Highcharts.theme = {
 	rangeSelector: {
 		buttonTheme: {
 			fill: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -174,7 +174,7 @@ Highcharts.theme = {
 			states: {
 				hover: {
 					fill: {
-						linearGradient: [0, 0, 0, 20],
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 						stops: [
 							[0.4, '#BBB'],
 							[0.6, '#888']
@@ -187,7 +187,7 @@ Highcharts.theme = {
 				},
 				select: {
 					fill: {
-						linearGradient: [0, 0, 0, 20],
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 						stops: [
 							[0.1, '#000'],
 							[0.3, '#333']
@@ -224,7 +224,7 @@ Highcharts.theme = {
 
 	scrollbar: {
 		barBackgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -233,7 +233,7 @@ Highcharts.theme = {
 		barBorderColor: '#CCC',
 		buttonArrowColor: '#CCC',
 		buttonBackgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -242,7 +242,7 @@ Highcharts.theme = {
 		buttonBorderColor: '#CCC',
 		rifleColor: '#FFF',
 		trackBackgroundColor: {
-			linearGradient: [0, 0, 0, 10],
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 			stops: [
 				[0, '#000'],
 				[1, '#333']

data/vendor/assets/javascripts/highcharts/themes/dark-green.js

@@ -133,7 +133,7 @@ Highcharts.theme = {
 	navigation: {
 		buttonOptions: {
 			backgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#606060'],
 					[0.6, '#333333']
@@ -160,7 +160,7 @@ Highcharts.theme = {
 	rangeSelector: {
 		buttonTheme: {
 			fill: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -174,7 +174,7 @@ Highcharts.theme = {
 			states: {
 				hover: {
 					fill: {
-						linearGradient: [0, 0, 0, 20],
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 						stops: [
 							[0.4, '#BBB'],
 							[0.6, '#888']
@@ -187,7 +187,7 @@ Highcharts.theme = {
 				},
 				select: {
 					fill: {
-						linearGradient: [0, 0, 0, 20],
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 						stops: [
 							[0.1, '#000'],
 							[0.3, '#333']
@@ -224,7 +224,7 @@ Highcharts.theme = {
 
 	scrollbar: {
 		barBackgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -233,7 +233,7 @@ Highcharts.theme = {
 		barBorderColor: '#CCC',
 		buttonArrowColor: '#CCC',
 		buttonBackgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -242,7 +242,7 @@ Highcharts.theme = {
 		buttonBorderColor: '#CCC',
 		rifleColor: '#FFF',
 		trackBackgroundColor: {
-			linearGradient: [0, 0, 0, 10],
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 			stops: [
 				[0, '#000'],
 				[1, '#333']

data/vendor/assets/javascripts/highcharts/themes/gray.js

@@ -8,7 +8,7 @@ Highcharts.theme = {
 		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
 	chart: {
 		backgroundColor: {
-			linearGradient: [0, 0, 0, 400],
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 			stops: [
 				[0, 'rgb(96, 96, 96)'],
 				[1, 'rgb(16, 16, 16)']
@@ -86,7 +86,7 @@ Highcharts.theme = {
 	},
 	tooltip: {
 		backgroundColor: {
-			linearGradient: [0, 0, 0, 50],
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 			stops: [
 				[0, 'rgba(96, 96, 96, .8)'],
 				[1, 'rgba(16, 16, 16, .8)']
@@ -132,7 +132,7 @@ Highcharts.theme = {
 	navigation: {
 		buttonOptions: {
 			backgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#606060'],
 					[0.6, '#333333']
@@ -159,7 +159,7 @@ Highcharts.theme = {
 	rangeSelector: {
 		buttonTheme: {
 			fill: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -173,7 +173,7 @@ Highcharts.theme = {
 			states: {
 				hover: {
 					fill: {
-						linearGradient: [0, 0, 0, 20],
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 						stops: [
 							[0.4, '#BBB'],
 							[0.6, '#888']
@@ -186,7 +186,7 @@ Highcharts.theme = {
 				},
 				select: {
 					fill: {
-						linearGradient: [0, 0, 0, 20],
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 						stops: [
 							[0.1, '#000'],
 							[0.3, '#333']
@@ -223,7 +223,7 @@ Highcharts.theme = {
 
 	scrollbar: {
 		barBackgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -232,7 +232,7 @@ Highcharts.theme = {
 		barBorderColor: '#CCC',
 		buttonArrowColor: '#CCC',
 		buttonBackgroundColor: {
-				linearGradient: [0, 0, 0, 20],
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 				stops: [
 					[0.4, '#888'],
 					[0.6, '#555']
@@ -241,7 +241,7 @@ Highcharts.theme = {
 		buttonBorderColor: '#CCC',
 		rifleColor: '#FFF',
 		trackBackgroundColor: {
-			linearGradient: [0, 0, 0, 10],
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
 			stops: [
 				[0, '#000'],
 				[1, '#333']

data/vendor/assets/javascripts/highcharts/themes/grid.js

@@ -7,7 +7,7 @@ Highcharts.theme = {
 	colors: ['#058DC7', '#50B432', '#ED561B', '#DDDF00', '#24CBE5', '#64E572', '#FF9655', '#FFF263', '#6AF9C4'],
 	chart: {
 		backgroundColor: {
-			linearGradient: [0, 0, 500, 500],
+			linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
 			stops: [
 				[0, 'rgb(255, 255, 255)'],
 				[1, 'rgb(240, 240, 255)']