Testing: Added a very simple serialization test

-- Modified serial.js a little so it could be loaded by the test harness
-- Removed dependency on some Angular/JQuery helper functions

Author: Ian Prest

render.js

@@ -1,4 +1,4 @@
-var $renderKey = {};
+var $renderKey = (typeof(exports) !== 'undefined') ? exports : {};
 (function () {
 	"use strict";
 

serial.js

@@ -1,57 +1,84 @@
-var $serial = {};
+var $serial = (typeof(exports) !== 'undefined') ? exports : {};
 (function () {
 	"use strict";
 
 	// We need this so we can test locally and still save layouts to AWS
 	$serial.base_href = "http://www.keyboard-layout-editor.com";
 
+	// Helper to copy an object; doesn't handle loops/circular refs, etc.
+	function copy(o) {
+		if (typeof(o) !== 'object') {
+			// primitive value
+			return o;
+		} else if (o instanceof Array) {
+			// array
+			var result = [];
+			for (var i = 0; i < o.length; i++) {
+				result[i] = copy(o[i]);
+			}
+			return result;
+		} else {
+			// Object
+			var result = {};
+			for (var prop in o) {
+				result[prop] = copy(o[prop]);
+			}
+			return result;
+		}
+	}
+	function isEmptyObject(o) {
+		for(var prop in o)
+			return false;
+		return true;
+	}
+
 	// Lenient JSON reader/writer
 	$serial.toJsonL = function(obj) {
 		var res = [], key;
 		if(obj instanceof Array) {
 			obj.forEach(function(elem) { res.push($serial.toJsonL(elem)); });
 			return '['+res.join(',')+']';
-		}		
+		}
 		if(typeof obj === 'object') {
 			for(key in obj) {	if(obj.hasOwnProperty(key)) { res.push(key+':'+$serial.toJsonL(obj[key])); } }
 			return '{'+res.join(',')+'}';
 		}
 		if(typeof obj === 'number') {
 			return Math.round10(obj,-4);
 		}
-		return angular.toJson(obj);	
+		return angular.toJson(obj);
 	};
 	$serial.fromJsonL = function(json) { return jsonl.parse(json); };
 
 	// function to sort the key array
 	$serial.sortKeys = function(keys) {
 		keys.sort(function(a,b) {
-			return ((a.rotation_angle+360)%360 - (b.rotation_angle+360)%360) || 
-				   (a.rotation_x - b.rotation_x) || 
-				   (a.rotation_y - b.rotation_y) || 
-				   (a.y - b.y) ||
-				   (a.x - b.x);
+			return ((a.rotation_angle+360)%360 - (b.rotation_angle+360)%360) ||
+					 (a.rotation_x - b.rotation_x) ||
+					 (a.rotation_y - b.rotation_y) ||
+					 (a.y - b.y) ||
+					 (a.x - b.x);
 		});
 	};
 
 	var _defaultKeyProps = {
 		x: 0, y: 0, x2: 0, y2: 0,								// position
 		width: 1, height: 1, width2: 1, height2: 1,				// size
 		color: "#cccccc", text: ["#000000"],	// colors
-		labels:[], align: 4, fontheight: 3, fontheight2: 3,		// label properties	
+		labels:[], align: 4, fontheight: 3, fontheight2: 3,		// label properties
 		rotation_angle: 0, rotation_x: 0, rotation_y: 0,		// rotation
 		profile: "", nub: false, ghost: false, stepped: false	// misc
 	};
 	var _defaultMetaData = { backcolor: '#eeeeee', name: '', author: '', notes: '' };
-	$serial.defaultKeyProps = function() { return angular.copy(_defaultKeyProps); };
-	$serial.defaultMetaData = function() { return angular.copy(_defaultMetaData); };
-	
+	$serial.defaultKeyProps = function() { return copy(_defaultKeyProps); };
+	$serial.defaultMetaData = function() { return copy(_defaultMetaData); };
+
 	// Convert between our in-memory format & our serialized format
 	function serializeProp(props, nname, val, defval) { if(val !== defval) { props[nname] = val; } return val; }
 	$serial.serialize = function(keyboard) {
 		var keys = keyboard.keys;
 		var rows = [], row = [];
-		var current = $serial.defaultKeyProps(); 
+		var current = $serial.defaultKeyProps();
 		current.text = current.text[0];
 		var cluster = {r:0, rx:0, ry:0};
 
@@ -60,7 +87,7 @@ var $serial = {};
 		for(var metakey in keyboard.meta) {
 			serializeProp(meta, metakey, keyboard.meta[metakey], _defaultMetaData[metakey]);
 		}
-		if(!$.isEmptyObject(meta)) {
+		if(!isEmptyObject(meta)) {
 			rows.push(meta);
 		}
 
@@ -76,7 +103,7 @@ var $serial = {};
 			// start a new row when necessary
 			var clusterChanged = (key.rotation_angle != cluster.r || key.rotation_x != cluster.rx || key.rotation_y != cluster.ry);
 			var rowChanged = (key.y !== current.y);
-			if(row.length>0 && (rowChanged || clusterChanged)) { 
+			if(row.length>0 && (rowChanged || clusterChanged)) {
 				// Push the old row
 				rows.push(row);
 				row = [];
@@ -85,11 +112,11 @@ var $serial = {};
 
 			if(newRow) {
 				// Set up for the new row
-				current.y++; 
+				current.y++;
 
 				// 'y' is reset if *either* 'rx' or 'ry' are changed
 				if(key.rotation_y != cluster.ry || key.rotation_x != cluster.rx)
-					current.y = key.rotation_y; 
+					current.y = key.rotation_y;
 				current.x = key.rotation_x; // always reset x to rx (which defaults to zero)
 
 				// Update current cluster
@@ -154,7 +181,7 @@ var $serial = {};
 				for(var k = 0; k < rows[r].length; ++k) {
 					var key = rows[r][k];
 					if(typeof key === 'string') {
-						var newKey = angular.copy(current);
+						var newKey = copy(current);
 						newKey.width2 = newKey.width2 === 0 ? current.width : current.width2;
 						newKey.height2 = newKey.height2 === 0 ? current.height : current.height2;
 						newKey.labels = key.split('\n');
@@ -199,7 +226,7 @@ var $serial = {};
 		}
 		return { meta:meta, keys:keys };
 	}
-	
+
 	$serial.saveLayout = function($http, layout, success, error) {
 		var data = angular.toJson(layout);
 		var fn = CryptoJS.MD5(data).toString();
@@ -221,7 +248,7 @@ var $serial = {};
 				transformRequest: angular.identity
 			}).success(function() { success(fn); }).error(function(data, status) {
 				if(status == 0) {
-					// We seem to get a 'cancelled' notification even though the POST 
+					// We seem to get a 'cancelled' notification even though the POST
 					// is successful, so we have to double-check.
 					$http.get($serial.base_href+"/layouts/"+fn).success(function() { success(fn); }).error(error);
 				} else {
@@ -230,5 +257,4 @@ var $serial = {};
 			});
 		});
 	};
-
 }());

tests/conf.js

@@ -1,4 +1,4 @@
 exports.config = {
   seleniumAddress: 'http://localhost:4444/wd/hub',
-  specs: ['kb-spec.js']
+  specs: ['kb-spec.js', 'kb-serial.js']
 };

tests/kb-serial.js

@@ -0,0 +1,11 @@
+$serial = require('../serial.js');
+
+describe('keyboard serialization', function() {
+
+  it('should handle empty keyboard', function() {
+    var original = [];
+    var kbd = $serial.deserialize(original);
+    expect($serial.serialize(kbd)).toEqual(original);
+  });
+
+});