From 550033ef2f3fa396b1f1e920407b2c560cb22de1 Mon Sep 17 00:00:00 2001
From: Gareth Powell <gmmapowell@yahoo.com>
Date: Thu, 17 Oct 2013 16:53:33 -0400
Subject: [PATCH 1/2] Resolved race condition when starting adapter after
 logging in.

---
 app/initializers/ziniki.js |   1 -
 app/routes/application.js  |   4 +-
 glazier-server             |   2 +-
 vendor/ziniki-ea.js        | 352 ----------------------
 vendor/ziniki-sr.js        | 175 -----------
 vendor/ziniki.js           | 304 -------------------
 vendor/ziniki/ziniki-ea.js |   2 +-
 vendor/ziniki/ziniki.js    | 581 +++++++++++++++++++------------------
 8 files changed, 299 insertions(+), 1122 deletions(-)
 delete mode 100644 vendor/ziniki-ea.js
 delete mode 100644 vendor/ziniki-sr.js
 delete mode 100644 vendor/ziniki.js

diff --git a/app/initializers/ziniki.js b/app/initializers/ziniki.js
index d7f5528..bf56c55 100644
--- a/app/initializers/ziniki.js
+++ b/app/initializers/ziniki.js
@@ -9,7 +9,6 @@ var initializer = {
     after: 'store',
 		
     initialize: function (container, application) {
-        Ember.Logger.log("Should be an initializer");
         Ziniki.init(host + "/resources", host + "/adapter");
         var dashboard = ZinikiSerializer.mapType(Glazier.Dashboard, "dashboard", "us.yapp.glazier.Dashboard", "us.yapp.glazier.dashboard");
         // Glazier's rails server stupidly uses non-standard ids
diff --git a/app/routes/application.js b/app/routes/application.js
index 2d9c887..2a87df0 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -5,14 +5,12 @@ var ApplicationRoute = Ember.Route.extend({
     var userController = this.controllerFor('user');
     var login = this.container.lookup('behavior:login');
 
-    login().then(function(user){
+    return login().then(function(user){
       // null object pattern might be better.
       if (user) {
         userController.set('content', user);
       }
     });
-
-    return null; // Ziniki related race condition
   },
   setupController: function(data) {
     this.controllerFor('application').set('isReady', true);
diff --git a/glazier-server b/glazier-server
index daae008..50b5cfb 160000
--- a/glazier-server
+++ b/glazier-server
@@ -1 +1 @@
-Subproject commit daae0082c25bef6e9d79cfb3cd9f6f9f198ca5b3
+Subproject commit 50b5cfb37534fe23be21b4858510bdb1a45dca3c
diff --git a/vendor/ziniki-ea.js b/vendor/ziniki-ea.js
deleted file mode 100644
index 5fb9b4b..0000000
--- a/vendor/ziniki-ea.js
+++ /dev/null
@@ -1,352 +0,0 @@
-define("ziniki/ea",
-  ["ziniki", "ziniki/sr"], function (Ziniki, ZinikiSerializer) {
-	
-   "use strict";
-   
-	/** When issuing requests to the server, we need to keep a record of
-	 * what we expected them to do and any other contextual information so
-	 * that we can handle the response.
-	 * 
-	 * We issue requests in a batch and expect to get a response which is the
-	 * same "shape" (i.e. an array with the same number of entries and compatible
-	 * with the answers).
-	 */
-	function Batch(webSocket) {
-		this.requests = [];
-		this.payload = [];
-
-		/** Add a request to the batch.  Append the actual request object
-		 * to requests, and its serialization into payload
-		 * 
-		 * request - any suitable request object (Find, FindAll, Create, etc)
-		 */
-		this.add = function(request) {
-			this.requests.push(request);
-			this.payload.push(request.serialize());
-		}
-
-		/** When the batch is ready, send it across to the server
-		 */
-		this.send = function() {
-			webSocket.send(this.payload, this, this.respond);
-		}
-
-		/** Handle the incoming batch response by processing each of the request elements in turn
-		 * and calling the original request with the slice of response.
-		 * 
-		 * json - the JSON object which comprises the response
-		 */
-		this.respond = function(json) {
-			if (json.length != this.requests.length)
-				throw "The response had a different number of entries to the request (" + json.length + "!=" + this.requests.length + ")";
-			for (var i=0;i<this.requests.length;i++) {
-				this.requests[i].handleActionResponse(json[i]);
-			}
-		}
-	}
-
-	/** A request for "Find"
-	 */
-	function Find(store, adapter, type, id, resolve, reject) {
-		var serializer = adapter.get('serializer');
-		var mapping = serializer.typeMapping(type);
-		var typeName = mapping.zinikiGenericName;
-
-		/** Serialize the request */
-		this.serialize = function() {
-			if (mapping && mapping.findByKey)
-				return {action:"findByKey",type:typeName,key:mapping.findByKey,values:[id]};
-		  else
-			  return {action:"find",type:typeName,findId:id};
-		}
-		
-		/** Handle the response when it comes back
-		 */
-		this.handleActionResponse = function(resp) {
-			var ret = null;
-			for (var p in resp) {
-				if (resp.hasOwnProperty(p)) {
-					if (p == typeName) {
-						var mapped = serializer.mapArray(type, resp[p]);
-						ret = mapped[0];
-					}
-					else {
-						var m = serializer.fromZinikiType(p);
-						for (var idx in serializer.mapArray(m.type, resp[p])) {
-							var q = resp[p][idx];
-							store.push(m.emberKey, q);
-						}
-					}
-				}
-			}
-			resolve(ret);
-		}
-	}
-	
-	/** A request for "FindAll"
-	 */
-	function FindAll(store, adapter, type, resolve, reject) {
-		var serializer = adapter.get('serializer');
-		var mapping = serializer.typeMapping(type);
-		var typeName = mapping.zinikiGenericName;
-
-		/** Serialize the request */
-		this.serialize = function() {
-			return {action:"findAll",type:typeName};
-		}
-		
-		/** Handle the response when it comes back
-		 */
-		this.handleActionResponse = function(resp) {
-			var ret = null;
-			for (var p in resp) {
-				if (resp.hasOwnProperty(p)) {
-					if (p == typeName)
-						ret = serializer.mapArray(type, resp[p]);
-					else {
-						var m = serializer.fromZinikiType(p);
-						for (var idx in resp[p]) {
-							var q = resp[p][idx];
-							store.push(m.emberKey, q);
-						}
-					}
-				}
-			}
-			resolve(ret);
-		}
-	}
-
-	/** A request for "FindMany"
-	 */
-	function FindMany(store, adapter, type, ids, resolve, reject) {
-		var serializer = adapter.get('serializer');
-		var mapping = serializer.typeMapping(type);
-		var typeName = mapping.zinikiGenericName;
-
-		/** Serialize the request */
-		this.serialize = function() {
-			if (mapping && mapping.findByKey) {
-				var many = [];
-				for (var i=0;i<ids.length;i++) {
-					many.push([ids[i]]);
-				}
-				return {action:"findManyByKey",type:typeName,key:mapping.findByKey,values:many};
-			} else
-			  return {action:"findMany",type:typeName,findIds:ids};
-		}
-		
-		/** Handle the response when it comes back
-		 */
-		this.handleActionResponse = function(resp) {
-			var ret = null;
-			for (var p in resp) {
-				if (resp.hasOwnProperty(p)) {
-					if (p == typeName)
-						ret = serializer.mapArray(type, resp[p]);
-					else {
-						var m = serializer.fromZinikiType(p);
-						for (var idx in resp[p]) {
-							var q = serializer.mapArray(m.type, resp[p][idx]);
-							store.push(m.emberKey, q);
-						}
-					}
-				}
-			}
-			resolve(ret);
-		}
-	}
-
-	/** A request for create (and create many)
-	 * type - the type of records to create
-	 * set - the set of records to create
-	 */
-	function Create(store, adapter, type, set, resolve, reject) {
-		var serializer = adapter.get('serializer');
-		var mapping = serializer.typeMapping(type);
-		var typeName = mapping.zinikiGenericName;
-		
-		/** Serialize the request */
-		this.serialize = function() {
-			var recs = [];
-			set.forEach(function(m) {
-				recs.push(adapter.serializeAndRename(type, m));
-			});
-			var payload = {};
-			payload[typeName] = recs;
-			return {action:"createMany",contentType:mapping.zinikiContentType,payload:payload};
-		}
-		
-		/** Handle the response when it comes back
-		 */
-		this.handleActionResponse = function(resp) {
-			if (!resp[typeName])
-				reject("There was no field " + typeName + " in the payload");
-			else {
-				var arr = resp[typeName];
-				if (arr.length != 1)
-					reject("There was not exactly one response in create");
-				else
-					resolve(arr[0]);
-			}
-		}
-	}
-	
-	/** A request for update (possibly many) records
-	 * type - the type of records to create
-	 * set - the set of records to create
-	 */
-	function Update(store, adapter, type, set, resolve, reject) {
-		var serializer = adapter.get('serializer');
-		var mapping = serializer.typeMapping(type);
-		var typeName = mapping.zinikiGenericName;
-		
-		/** Serialize the request */
-		this.serialize = function() {
-			var recs = [];
-			set.forEach(function(m) {
-				recs.push(adapter.serializeAndRename(type, m));
-			});
-			var payload = {};
-			payload[typeName] = recs;
-			return {action:"updateMany",payload:payload};
-		}
-		
-		/** Handle the response when it comes back
-		 */
-		this.handleActionResponse = function(resp) {
-			if (!resp[type.zinikiGenericName])
-				reject("There was no field " + type.zinikiGenericName + " in the payload");
-			else {
-				var arr = resp[type.zinikiGenericName];
-				if (arr.length != 1)
-					reject("There was not exactly one response in create");
-				else
-					resolve(arr[0]);
-			}
-		}
-	}
-	
-	/** Define the Ziniki adapter.  This stays as close to the REST protocol as possible.
-	 * 
-	 */
-	var Adapter = DS.Adapter.extend({
-		/** Initialize the adapter by "connecting" to Ziniki.  This actually assumes that Ziniki is
-		 * already connected and there are issues with obtaining login information and credentials if
-		 * it is not.
-		 */
-		init: function() {
-			this.set('webSocket', Ziniki.getWebSocket());
-			this.set('serializer', ZinikiSerializer.create({ container: this.container }));
-	    this._super.apply(this, arguments);
-		},
-		
-		/** Find an individual record by its ID.
-		 */
-		find: function(store, type, id) {
-			var self = this;
-			return new Ember.RSVP.Promise(function(resolve, reject) {
-				var batch = new Batch(self.get('webSocket'));
-				batch.add(new Find(store, self, type, id, resolve, reject));
-				batch.send();
-			});
-		},
-		
-		/** Find all the records in Ziniki which correspond to a given
-		 * Ember Data type.
-		 */
-		findAll: function(store, type, since) {
-			var self = this;
-			return new Ember.RSVP.Promise(function(resolve, reject) {
-				var batch = new Batch(self.get('webSocket'));
-				batch.add(new FindAll(store, self, type, resolve, reject));
-				batch.send();
-			});
-		},
-
-		/** Find multiple records in Ziniki which correspond to a given
-		 * Ember Data type.
-		 */
-		findMany: function(store, type, ids, owner) {
-			var self = this;
-			return new Ember.RSVP.Promise(function(resolve, reject) {
-				var batch = new Batch(self.get('webSocket'));
-				batch.add(new FindMany(store, self, type, ids, resolve, reject));
-				batch.send();
-			});
-		},
-
-		/** Find multiple records in Ziniki based on following a "HasMany" relationship
-		 */
-		findHasMany: function(store, record, link, relationship) {
-      throw new Error("I'm not sure about this");
-//			var self = this;
-//			return new Ember.RSVP.Promise(function(resolve, reject) {
-//				var batch = new Batch(self.get('webSocket'));
-//				batch.add(new FindMany(store, self, type, ids, resolve, reject));
-//				batch.send();
-//			});
-		},
-
-	  createRecord: function(store, type, record) {
-			var self = this;
-			return new Ember.RSVP.Promise(function(resolve, reject) {
-				var batch = new Batch(self.get('webSocket'));
-				self.batchCreate(store, self, batch, type, [record], resolve, reject);
-				batch.send();
-			});
-	  },
-		
-	  updateRecord: function(store, type, record) {
-	  	console.log("update, yo!");
-			var self = this;
-			return new Ember.RSVP.Promise(function(resolve, reject) {
-				var batch = new Batch(self.get('webSocket'));
-				self.batchUpdate(store, self, batch, type, [record], resolve, reject);
-				batch.send();
-			});
-	  },
-		
-	  deleteRecord: function() {
-	  	throw "Ziniki does not support standard 'delete()' semantics";
-	  },
-
-	  // Place a new create record in a batch
-		batchCreate: function(store, adapter, batch, type, set, resolve, reject) {
-			batch.add(new Create(store, adapter, type, set, resolve, reject));
-		},
-
-	  // Place a new update record in a batch
-		batchUpdate: function(store, adapter, batch, type, set, resolve, reject) {
-			batch.add(new Update(store, adapter, type, set, resolve, reject));
-		},
-
-	  // serialize the object, then rename the resulting hash as appropriate
-	  serializeAndRename: function(type, record) {
-	  	var hash = this.serialize(record, { includeId: true });
-			var mt = ZinikiSerializer.types[type.toString()];
-			if (mt && mt.outboundRenames) {
-				var map = mt.outboundRenames;
-				var ret = {};
-				for (var p in hash) {
-					if (hash.hasOwnProperty(p)) {
-						if (map.hasOwnProperty(p))
-							ret[map[p]] = hash[p];
-						else
-							ret[p] = hash[p];
-					}
-				}						
-			} else
-				ret = hash;
-			if (record["zinikiCreationOptions"])
-				ret["ziniki"] = record["zinikiCreationOptions"];
-			return ret;
-	  },
-
-	  toString: function() {
-	  	return "Ziniki.Adapter";
-	  }
-		
-	});
-	
-	return Adapter;
-});
diff --git a/vendor/ziniki-sr.js b/vendor/ziniki-sr.js
deleted file mode 100644
index 942e638..0000000
--- a/vendor/ziniki-sr.js
+++ /dev/null
@@ -1,175 +0,0 @@
-define("ziniki/sr",
-  ["ziniki"], function (Ziniki) {
-	
-   "use strict";
-   
-	/** We need to keep a number of elements in line to record
-	 * all the things we need to do between the Ember models and the Ziniki models.
-	 * This record is indexed multiple ways but exists once for each Ember type.
-	 */
-	function TypeMapping(type, emberKey, generic, content) {
-		this.type = type;
-		this.emberKey = emberKey;
-		this.zinikiGenericName = generic;
-		this.zinikiContentType = content;
-		this.findByKey = null;
-		this.outboundRenames = {};
-		this.inboundRenames = {};
-		
-		/** Allow the user to specify that a field has a different name in Ember to what it does in Ziniki
-		 */
-		this.renameField = function(ember, ziniki) {
-			this.outboundRenames[ember] = ziniki;
-			this.inboundRenames[ziniki] = ember;
-		}
-
-		/** Specify that the id field has a "natural" key, rather than a Ziniki ID.
-		 * In this case, there must be an index to find by ID.
-		 */
-		this.naturalKey = function(ziniki, findByKey) {
-			if (this.findByKey)
-				throw "Cannot specify more than one natural key";
-			this.outboundRenames['id'] = ziniki;
-			this.inboundRenames[ziniki] = 'id';
-			
-			// TODO: surely we need to map the actual id to something else?
-			// Will that just work without a specific slot to place it in?
-			
-			if (findByKey.lastIndexOf(".") != -1)
-				this.findByKey = findByKey;
-			else {
-				var pkgIdx = this.zinikiGenericName.lastIndexOf(".");
-				var pkg = this.zinikiGenericName.substr(0, pkgIdx);
-				this.findByKey = pkg+"."+findByKey;
-			}
-		}
-	}
-	
-	/** The serializer is mainly responsible for doing any class and field renaming that we need
-	 * In order to support this, it provides static methods to set up the bindings.
-	 */
-	 var ZinikiSerializer = DS.JSONSerializer.extend({
-		init: function() {
-			this._super();
-			this.set('bindings', {});
-			console.log("Creating Ziniki Serializer");
-		},
-		
-		debugInfo: "ZinikiSerializer",
-
-		// this overrides the parent method
-		simpleTypeName: function(type) {
-			if (type.mappedName)
-				return type.mappedName;
-			var name = type.toString();
-	    var spl = name.split(".");
-	    return spl[spl.length - 1];
-		},
-
-		// get the name of the Ziniki projection type
-		rootForType: function(type) {
-			var tn = type.toString();
-			var bindings = ZinikiSerializer.types;
-			var forMe = bindings[tn];
-			if (forMe && forMe.zinikiGenericName)
-				return forMe.zinikiGenericName;
-			var ns = tn.substr(0, tn.lastIndexOf("."));
-			var defaultPackage = ZinikiSerializer.packages[ns];
-			if (!defaultPackage)
-				throw "There is no binding for type '" + type + "' and there is no default package for namespace '" + ns + "'";
-			var mapTo = this.simpleTypeName(type);
-			return defaultPackage.pkgName + "." + mapTo;
-		},
-		
-		// get the content type by a similar mechanism
-		contentType: function(type) {
-			var tn = type.toString();
-			var bindings = ZinikiSerializer.types;
-			var forMe = bindings[tn];
-			if (forMe && forMe.zinikiContentType)
-				return forMe.zinikiContentType;
-			var ns = tn.substr(0, tn.lastIndexOf("."));
-			var defaultPackage = ZinikiSerializer.packages[ns];
-			if (!defaultPackage)
-				throw "There is no binding for type '" + type + "' and there is no default package for namespace '" + ns + "'";
-			var mapTo = this.simpleTypeName(type);
-			return defaultPackage.pkgName + "." + mapTo.charAt(0).toLowerCase() + mapTo.slice(1);
-		},
-		
-		// and get the whole type mapping process
-		typeMapping: function(type) {
-			var tn = type;
-			if (!(tn instanceof String))
-				tn = tn.toString();
-			var bindings = ZinikiSerializer.types;
-			return bindings[tn];
-		},
-		
-		fromZinikiType: function(zinikiType) {
-			var mappings = ZinikiSerializer.inboundTypes;
-			var forMe = mappings[zinikiType];
-			if (forMe && forMe.type)
-				return forMe;
-			throw "Cannot find the local type for " + zinikiType;
-			/*
-			var ns = tn.substr(0, tn.lastIndexOf("."));
-			var defaultPackage = ZinikiSerializer.packages[ns];
-			if (!defaultPackage)
-				throw "There is no binding for type '" + type + "' and there is no default package for namespace '" + ns + "'";
-			var mapTo = this.simpleTypeName(type);
-			return defaultPackage.pkgName + "." + mapTo;
-			*/
-		},
-
-		/** Upon return from Ziniki, we need to rename a bunch of things.
-		 * Do this here, recursively over the input
-		 */
-		mapArray: function(type, array) {
-			var ret = [];
-			for (var i=0;i<array.length;i++)
-				ret.push(this.mapNames(type, array[i]));
-			return ret;
-		},
-		mapNames: function(type, hash) {
-			var mt = ZinikiSerializer.types[type.toString()];
-			if (mt && mt.inboundRenames) {
-				var map = mt.inboundRenames;
-				var ret = {};
-				for (var p in hash) {
-					if (hash.hasOwnProperty(p)) {
-						if (map.hasOwnProperty(p)) {
-							ret['_ziniki_' + map[p]] = hash[map[p]];
-							ret[map[p]] = hash[p];
-            } else {
-							ret[p] = hash[p];
-            }
-					}
-				}
-				return ret;
-			}
-			return hash;
-		},
-		
-		// pluralization is for other people ...
-		pluralize: function(s) {
-			return s;
-		}
-
-	});
-	
-	ZinikiSerializer.reopenClass({
-		packages: {},
-		types: {},
-		inboundTypes: {},
-		
-		mapType: function(type, emberKey, zgeneric, zcontent) {
-			var ret = new TypeMapping(type, emberKey, zgeneric, zcontent);
-			this.types[type.toString()] = ret;
-			if (zgeneric)
-				this.inboundTypes[zgeneric] = ret; 
-			return ret;
-		}
-	})
-	
-	return ZinikiSerializer;
-});
diff --git a/vendor/ziniki.js b/vendor/ziniki.js
deleted file mode 100644
index e8c6913..0000000
--- a/vendor/ziniki.js
+++ /dev/null
@@ -1,304 +0,0 @@
-define("ziniki",
-  [/*atmosphere*/], function() {
-
-	"use strict";
-    
-	var Ziniki = {};
-
-  var url = null;
-  var wsUrl = null;
-  var webSocket = null;
-  var token = null;
-  var performingLogin = false;
-  var onSuccessfulLogin = [];
-
-	/** We need to keep track of all server requests by id
-	 * and then map those ids back to the requests so that
-	 * we can handle the reponses
-	 */
-	function PendingDispatch(obj, handler) {
-		
-		this.dispatch = function(json) {
-			if (obj != null)
-				handler.apply(obj, [json]);
-			else
-				handler(json);
-		}
-		
-		this.handleError = function(json) {
-			console.log("We should use promises");
-			console.log("Error reported from Ziniki:", json);
-		}
-	}
-
-  /** This object is responsible for wrapping up the Atmosphere web socket in something
-   * that we can use more broadly and add our own interfaces on.
-   */
-  function WebSocket() {
-  	this.conn = null;
-  	this.delayed = [];
-  	this.pending = {};
-  	this.requestNo = 1;
-  	
-		this.send = function(packet, obj, handler) {
-			var json = JSON.stringify(packet);
-			console.log("Sending request " + this.requestNo +":", json);
-			var payload = this.requestNo + json;
-			if (this.conn)
-				this.conn.push(payload);
-			else
-				this.delayed.push(payload);
-			this.pending[this.requestNo] = new PendingDispatch(obj, handler);
-			this.requestNo++;
-		};
-
-		/** Do the work to create a websocket: initialize atmosphere,
-		 * pass a request, and handle the "open" message
-		 */
-		this.create = function(obj, onReady) {
-			var self = this;
-			
-			// create the request to open up the connection
-			var open = {
-					url: wsUrl,
-					transport: 'websocket',
-					fallbackTransport: 'long-polling',
-					
-					// handle the "open" message
-					onOpen: function(response) {
-						self.conn.push(JSON.stringify({"X-Ziniki-Token": token, "Protocol": "emberREST"}));
-					},
-					
-					// and then handle each incoming message
-					onMessage: function(response) {
-						var body = response.responseBody;
-						if (body == "Confirm") {
-							if (onReady) {
-								if (!obj)
-									onReady(self);
-								else
-									onReady.apply(obj, [self]);
-							}
-							for (var i=0;i<self.delayed.length;i++)
-								self.conn.push(self.delayed[i]);
-						}
-						else
-							self.dispatch(body);
-					}
-			};
-			this.conn = jQuery.atmosphere.subscribe(open);
-		};
-		
-		this.dispatch = function(body) {
-			// This should be in Ziniki
-			var isError = false;
-			var idx = body.indexOf('[');
-			if (idx == -1) {
-				idx = body.indexOf('{');
-				if (idx == -1)
-					throw "Cannot interpret body " + body;
-				isError = true;
-			}
-			var rn = body.substring(0, idx);
-			var req = this.pending[rn];
-			var json = body.substring(idx);
-			console.log("Received response " + rn + ": ", json);
-			var msg = JSON.parse(json);
-			if (isError)
-				req.handleError(msg);
-			else
-				req.dispatch(msg);
-		};
-  };
-  
-  /** Tell us how to find Ziniki
-   * 
-   */
-	function init(inUrl, inWsUrl) {
-		url = inUrl;
-		wsUrl = inWsUrl;
-	};
-	
-	/** Get the dedicated websocket connection for adapter functionality and
-	 * real-time notifications, creating it if necessary
-	 */
-	function getWebSocket(obj, onReady) {
-		if (webSocket)
-			return webSocket;
-		if (!wsUrl)
-			throw "Cannot open websocket without a websocket URL";
-
-		// We can't set up the websocket without a login token, but if that process
-		// is already under way, don't complain, just wait for the response
-		if (token == null && !performingLogin)
-				throw "Cannot open websocket until logged in";
-		
-		// OK, create the websocket object
-		webSocket = new WebSocket();
-		if (token != null)
-			webSocket.create(obj, onReady);
-		else
-			onSuccessfulLogin.push(function() { webSocket.create(obj, onReady); });
-		return webSocket;
-	}
-	
-	function zinikiGet(url, success, failure) {
-		jQuery.ajax({
-			type: "GET",
-			url: url,
-			headers: {
-				"Accept": "application/json",
-				"X-Ziniki-Token": token
-			},
-			success: function(json, status, xhr) {
-				if (success != null)
-				  success(json, xhr);
-			},
-			error: function(xhr, text, error) {
-				if (failure != null)
-					failure(error, xhr);
-			}
-		});
-	};
-
-	function zinikiPost(url, payload, success, failure) {
-		var options = {
-			type: "POST",
-			headers: {
-				"Accept": "application/json"
-			},
-			success: function(json, status, xhr) {
-				if (success != null)
-				  success(json, xhr);
-			},
-			error: function(xhr, text, error) {
-				console.log("Saw error ", text, error);
-				if (failure != null)
-					failure(xhr);
-			}
-		};
-		if (token != null) {
-			options.headers["X-Ziniki-Token"] = token;
-		}
-		if (payload != null) {
-			options.data = JSON.stringify(payload);
-			options.dataType = 'json';
-			options.contentType = 'application/json';
-		}
-		jQuery.ajax(url, options);
-	};
-	
-	function login(method, username, options, success, failure) {
-	    performingLogin = true;
-	    
-	    var ret = Ember.RSVP.defer();
-			if (method == "openid") {
-			  	zinikiGet(url+'/login?method=openid&provider='+options.provider, handleSuccess, function() { performingLogin = false; if (failure) failure(arguments); });
-			} else {
-				  var hash = $.extend({"method":method,"login":username}, options);
-				  var loginPacket = {"ZinikiCredential":hash};
-				  zinikiPost(url+'/login', loginPacket, handleSuccess, failure);
-			}
-			
-			return ret.promise;
-	    
-			// On success, we want to come back here and let everybody know the good news.
-			// This includes people who were waiting while we were doing the round trip
-		  function handleSuccess(json, xhr) {
-		      performingLogin = false;
-			    token = xhr.getResponseHeader("X-Ziniki-Token");
-				  ret.resolve();
-			    if (success)
-				      success(json);
-			    for (var i=0;i<onSuccessfulLogin.length;i++)
-				      onSuccessfulLogin[i]();
-			    onSuccessfulLogin = [];
-		  }
-
-	};
-	
-	function logout() {
-		zinikiPost(url+"/logout", null, null, null);
-	}
-
-	// If you already have a token, you can call this
-	function reuseToken(inToken) {
-		token = inToken;
-	};
-
-	// This creates a new credential
-	function newCredential(method, username, options, success, failure) {
-		var kvoptions = [];
-		for (var k in options) {
-			if (options.hasOwnProperty(k))
-				kvoptions.push({"Option":{"key":k,"value":options[k]}});
-		}
-		var hash = $.extend({"method":method,"login":username}, {"options":kvoptions});
-		var credPacket = {"org.ziniki.builtin.commands.CaOpArgs": hash};
-		zinikiPost(url+'/org.ziniki.builtin/ca/newCredential', credPacket, success, failure);
-	};
-
-	// With a new credential, comes (potentially) a new identity.
-	// Note: you must already be logged in
-	function createIdentity(success, failure) {
-		zinikiPost(url+'/org.ziniki.builtin/ca/createIdentity', null, success, failure);
-	};
-
-	// Authorize an application
-	function authorize(app, success, failure) {
-		zinikiPost(url+'/org.ziniki.builtin/ca/authorize', {"org.ziniki.builtin.commands.CaOpArgs": {"application":app}}, success, failure);
-	};
-
-	function assembleUrl(app, prot, resource, id, method) {
-		var rest = url;
-		if (app != null)
-			rest += "/"+app;
-		if (prot != null)
-			rest += "/"+prot;
-		if (resource != null) {
-			rest += "/"+resource;
-			if (id != null)
-				rest += "/"+id;
-	  }
-		if (method != null)
-			rest += "/"+method;
-		return rest;
-	};
-	
-	function zinikiGetResource(app, prot, resource, id, success, failure) {
-		var rest = assembleUrl(app, prot, resource, id);
-		zinikiGet(rest, success, failure);
-	}
-
-	function zinikiSave(app, prot, resource, id, data, success, failure) {
-		var rest = assembleUrl(app, prot, resource, id);
-		zinikiPost(rest, data, success, failure);
-	}
-
-	function zinikiCall(app, prot, method, data, success, failure) {
-		var rest = assembleUrl(app, prot, null, null, method);
-		zinikiPost(rest, data, success, failure);
-	}
-
-	function zinikiInvoke(app, prot, resource, id, method, data, success, failure) {
-		var rest = assembleUrl(app, prot, resource, id, method);
-		zinikiPost(rest, data, success, failure);
-	}
-
-	Ziniki = {
-			init: init,
-			login: login,
-			logout: logout,
-			reuseToken: reuseToken,
-			newCredential: newCredential,
-			createIdentity: createIdentity,
-			authorize: authorize,
-			get: zinikiGetResource,
-			call: zinikiCall,
-			invoke: zinikiInvoke,
-			save: zinikiSave,
-			getWebSocket: getWebSocket
-	};
-	
-  return Ziniki;
-});
\ No newline at end of file
diff --git a/vendor/ziniki/ziniki-ea.js b/vendor/ziniki/ziniki-ea.js
index 55f6d8e..a4a1f25 100644
--- a/vendor/ziniki/ziniki-ea.js
+++ b/vendor/ziniki/ziniki-ea.js
@@ -278,7 +278,7 @@ define("ziniki/ea",
 		/** Find multiple records in Ziniki based on following a "HasMany" relationship
 		 */
 		findHasMany: function(store, record, link, relationship) {
-			console.log("I'm not sure about this");
+			throw new Error("I'm not sure about this");
 //			var self = this;
 //			return new Ember.RSVP.Promise(function(resolve, reject) {
 //				var batch = new Batch(self.get('webSocket'));
diff --git a/vendor/ziniki/ziniki.js b/vendor/ziniki/ziniki.js
index e8c6913..8d7ce91 100644
--- a/vendor/ziniki/ziniki.js
+++ b/vendor/ziniki/ziniki.js
@@ -1,304 +1,315 @@
 define("ziniki",
-  [/*atmosphere*/], function() {
+    [/*atmosphere*/], function() {
 
-	"use strict";
-    
-	var Ziniki = {};
+  "use strict";
+
+  var Ziniki = {};
 
   var url = null;
   var wsUrl = null;
   var webSocket = null;
   var token = null;
   var performingLogin = false;
-  var onSuccessfulLogin = [];
-
-	/** We need to keep track of all server requests by id
-	 * and then map those ids back to the requests so that
-	 * we can handle the reponses
-	 */
-	function PendingDispatch(obj, handler) {
-		
-		this.dispatch = function(json) {
-			if (obj != null)
-				handler.apply(obj, [json]);
-			else
-				handler(json);
-		}
-		
-		this.handleError = function(json) {
-			console.log("We should use promises");
-			console.log("Error reported from Ziniki:", json);
-		}
-	}
+//var onSuccessfulLogin = [];
+
+  /** We need to keep track of all server requests by id
+   * and then map those ids back to the requests so that
+   * we can handle the reponses
+   */
+  function PendingDispatch(obj, handler) {
+
+    this.dispatch = function(json) {
+      if (obj != null)
+        handler.apply(obj, [json]);
+      else
+        handler(json);
+    }
+
+    this.handleError = function(json) {
+      console.log("We should use promises");
+      console.log("Error reported from Ziniki:", json);
+    }
+  }
 
   /** This object is responsible for wrapping up the Atmosphere web socket in something
    * that we can use more broadly and add our own interfaces on.
    */
   function WebSocket() {
-  	this.conn = null;
-  	this.delayed = [];
-  	this.pending = {};
-  	this.requestNo = 1;
-  	
-		this.send = function(packet, obj, handler) {
-			var json = JSON.stringify(packet);
-			console.log("Sending request " + this.requestNo +":", json);
-			var payload = this.requestNo + json;
-			if (this.conn)
-				this.conn.push(payload);
-			else
-				this.delayed.push(payload);
-			this.pending[this.requestNo] = new PendingDispatch(obj, handler);
-			this.requestNo++;
-		};
-
-		/** Do the work to create a websocket: initialize atmosphere,
-		 * pass a request, and handle the "open" message
-		 */
-		this.create = function(obj, onReady) {
-			var self = this;
-			
-			// create the request to open up the connection
-			var open = {
-					url: wsUrl,
-					transport: 'websocket',
-					fallbackTransport: 'long-polling',
-					
-					// handle the "open" message
-					onOpen: function(response) {
-						self.conn.push(JSON.stringify({"X-Ziniki-Token": token, "Protocol": "emberREST"}));
-					},
-					
-					// and then handle each incoming message
-					onMessage: function(response) {
-						var body = response.responseBody;
-						if (body == "Confirm") {
-							if (onReady) {
-								if (!obj)
-									onReady(self);
-								else
-									onReady.apply(obj, [self]);
-							}
-							for (var i=0;i<self.delayed.length;i++)
-								self.conn.push(self.delayed[i]);
-						}
-						else
-							self.dispatch(body);
-					}
-			};
-			this.conn = jQuery.atmosphere.subscribe(open);
-		};
-		
-		this.dispatch = function(body) {
-			// This should be in Ziniki
-			var isError = false;
-			var idx = body.indexOf('[');
-			if (idx == -1) {
-				idx = body.indexOf('{');
-				if (idx == -1)
-					throw "Cannot interpret body " + body;
-				isError = true;
-			}
-			var rn = body.substring(0, idx);
-			var req = this.pending[rn];
-			var json = body.substring(idx);
-			console.log("Received response " + rn + ": ", json);
-			var msg = JSON.parse(json);
-			if (isError)
-				req.handleError(msg);
-			else
-				req.dispatch(msg);
-		};
+    this._conn = null;
+    this.delayed = [];
+    this.pending = {};
+    this.requestNo = 1;
+
+    this.send = function(packet, obj, handler) {
+      var json = JSON.stringify(packet);
+      console.log("Sending request " + this.requestNo +":", json);
+      var payload = this.requestNo + json;
+      this.conn().then(function(conn) {
+        conn.push(payload);
+      });
+      this.pending[this.requestNo] = new PendingDispatch(obj, handler);
+      this.requestNo++;
+    };
+
+    this.conn = function() {
+      if (!this._conn) {
+        this._conn = this.create();
+        return this._conn;
+      };
+    }
+
+    /** Do the work to create a websocket: initialize atmosphere,
+     * pass a request, and handle the "open" message
+     */
+    this.create = function() {
+      if (token == null && !performingLogin)
+        throw "Cannot open websocket until logged in";
+      var self = this;
+      var actualConn;
+      return new Ember.RSVP.Promise(function(resolve, reject) {
+        // create the request to open up the connection
+        var open = {
+            url: wsUrl,
+            transport: 'websocket',
+            fallbackTransport: 'long-polling',
+
+            // handle the "open" message
+            onOpen: function(response) {
+              actualConn.push(JSON.stringify({"X-Ziniki-Token": token, "Protocol": "emberREST"}));
+            },
+
+            // and then handle each incoming message
+            onMessage: function(response) {
+              var body = response.responseBody;
+              if (body == "Confirm") {
+                resolve(actualConn);
+                // All replaced by promise
+//              if (onReady) {
+//              if (!obj)
+//              onReady(self);
+//              else
+//              onReady.apply(obj, [self]);
+//              }
+//              for (var i=0;i<self.delayed.length;i++)
+//              self.conn.push(self.delayed[i]);
+              }
+              else
+                self.dispatch(body);
+            }
+        };
+        actualConn = jQuery.atmosphere.subscribe(open);
+      });
+    };
+
+    this.dispatch = function(body) {
+      var isError = false;
+      var idx = body.indexOf('[');
+      if (idx == -1) {
+        idx = body.indexOf('{');
+        if (idx == -1)
+          throw "Cannot interpret body " + body;
+        isError = true;
+      }
+      var rn = body.substring(0, idx);
+      var req = this.pending[rn];
+      var json = body.substring(idx);
+      console.log("Received response " + rn + ": ", json);
+      var msg = JSON.parse(json);
+      if (isError)
+        req.handleError(msg);
+      else
+        req.dispatch(msg);
+    };
   };
-  
+
   /** Tell us how to find Ziniki
    * 
    */
-	function init(inUrl, inWsUrl) {
-		url = inUrl;
-		wsUrl = inWsUrl;
-	};
-	
-	/** Get the dedicated websocket connection for adapter functionality and
-	 * real-time notifications, creating it if necessary
-	 */
-	function getWebSocket(obj, onReady) {
-		if (webSocket)
-			return webSocket;
-		if (!wsUrl)
-			throw "Cannot open websocket without a websocket URL";
-
-		// We can't set up the websocket without a login token, but if that process
-		// is already under way, don't complain, just wait for the response
-		if (token == null && !performingLogin)
-				throw "Cannot open websocket until logged in";
-		
-		// OK, create the websocket object
-		webSocket = new WebSocket();
-		if (token != null)
-			webSocket.create(obj, onReady);
-		else
-			onSuccessfulLogin.push(function() { webSocket.create(obj, onReady); });
-		return webSocket;
-	}
-	
-	function zinikiGet(url, success, failure) {
-		jQuery.ajax({
-			type: "GET",
-			url: url,
-			headers: {
-				"Accept": "application/json",
-				"X-Ziniki-Token": token
-			},
-			success: function(json, status, xhr) {
-				if (success != null)
-				  success(json, xhr);
-			},
-			error: function(xhr, text, error) {
-				if (failure != null)
-					failure(error, xhr);
-			}
-		});
-	};
-
-	function zinikiPost(url, payload, success, failure) {
-		var options = {
-			type: "POST",
-			headers: {
-				"Accept": "application/json"
-			},
-			success: function(json, status, xhr) {
-				if (success != null)
-				  success(json, xhr);
-			},
-			error: function(xhr, text, error) {
-				console.log("Saw error ", text, error);
-				if (failure != null)
-					failure(xhr);
-			}
-		};
-		if (token != null) {
-			options.headers["X-Ziniki-Token"] = token;
-		}
-		if (payload != null) {
-			options.data = JSON.stringify(payload);
-			options.dataType = 'json';
-			options.contentType = 'application/json';
-		}
-		jQuery.ajax(url, options);
-	};
-	
-	function login(method, username, options, success, failure) {
-	    performingLogin = true;
-	    
-	    var ret = Ember.RSVP.defer();
-			if (method == "openid") {
-			  	zinikiGet(url+'/login?method=openid&provider='+options.provider, handleSuccess, function() { performingLogin = false; if (failure) failure(arguments); });
-			} else {
-				  var hash = $.extend({"method":method,"login":username}, options);
-				  var loginPacket = {"ZinikiCredential":hash};
-				  zinikiPost(url+'/login', loginPacket, handleSuccess, failure);
-			}
-			
-			return ret.promise;
-	    
-			// On success, we want to come back here and let everybody know the good news.
-			// This includes people who were waiting while we were doing the round trip
-		  function handleSuccess(json, xhr) {
-		      performingLogin = false;
-			    token = xhr.getResponseHeader("X-Ziniki-Token");
-				  ret.resolve();
-			    if (success)
-				      success(json);
-			    for (var i=0;i<onSuccessfulLogin.length;i++)
-				      onSuccessfulLogin[i]();
-			    onSuccessfulLogin = [];
-		  }
-
-	};
-	
-	function logout() {
-		zinikiPost(url+"/logout", null, null, null);
-	}
-
-	// If you already have a token, you can call this
-	function reuseToken(inToken) {
-		token = inToken;
-	};
-
-	// This creates a new credential
-	function newCredential(method, username, options, success, failure) {
-		var kvoptions = [];
-		for (var k in options) {
-			if (options.hasOwnProperty(k))
-				kvoptions.push({"Option":{"key":k,"value":options[k]}});
-		}
-		var hash = $.extend({"method":method,"login":username}, {"options":kvoptions});
-		var credPacket = {"org.ziniki.builtin.commands.CaOpArgs": hash};
-		zinikiPost(url+'/org.ziniki.builtin/ca/newCredential', credPacket, success, failure);
-	};
-
-	// With a new credential, comes (potentially) a new identity.
-	// Note: you must already be logged in
-	function createIdentity(success, failure) {
-		zinikiPost(url+'/org.ziniki.builtin/ca/createIdentity', null, success, failure);
-	};
-
-	// Authorize an application
-	function authorize(app, success, failure) {
-		zinikiPost(url+'/org.ziniki.builtin/ca/authorize', {"org.ziniki.builtin.commands.CaOpArgs": {"application":app}}, success, failure);
-	};
-
-	function assembleUrl(app, prot, resource, id, method) {
-		var rest = url;
-		if (app != null)
-			rest += "/"+app;
-		if (prot != null)
-			rest += "/"+prot;
-		if (resource != null) {
-			rest += "/"+resource;
-			if (id != null)
-				rest += "/"+id;
-	  }
-		if (method != null)
-			rest += "/"+method;
-		return rest;
-	};
-	
-	function zinikiGetResource(app, prot, resource, id, success, failure) {
-		var rest = assembleUrl(app, prot, resource, id);
-		zinikiGet(rest, success, failure);
-	}
-
-	function zinikiSave(app, prot, resource, id, data, success, failure) {
-		var rest = assembleUrl(app, prot, resource, id);
-		zinikiPost(rest, data, success, failure);
-	}
-
-	function zinikiCall(app, prot, method, data, success, failure) {
-		var rest = assembleUrl(app, prot, null, null, method);
-		zinikiPost(rest, data, success, failure);
-	}
-
-	function zinikiInvoke(app, prot, resource, id, method, data, success, failure) {
-		var rest = assembleUrl(app, prot, resource, id, method);
-		zinikiPost(rest, data, success, failure);
-	}
-
-	Ziniki = {
-			init: init,
-			login: login,
-			logout: logout,
-			reuseToken: reuseToken,
-			newCredential: newCredential,
-			createIdentity: createIdentity,
-			authorize: authorize,
-			get: zinikiGetResource,
-			call: zinikiCall,
-			invoke: zinikiInvoke,
-			save: zinikiSave,
-			getWebSocket: getWebSocket
-	};
-	
+  function init(inUrl, inWsUrl) {
+    url = inUrl;
+    wsUrl = inWsUrl;
+  };
+
+  /** Get the dedicated websocket connection for adapter functionality and
+   * real-time notifications, creating it if necessary
+   */
+  function getWebSocket() {
+    if (webSocket)
+      return webSocket;
+    if (!wsUrl)
+      throw "Cannot open websocket without a websocket URL";
+
+    // We can't set up the websocket without a login token, but if that process
+    // is already under way, don't complain, just wait for the response
+    if (token == null && !performingLogin)
+      throw "Cannot open websocket until logged in";
+
+    // OK, create the websocket object
+    webSocket = new WebSocket();
+//  if (token != null)
+//  webSocket.create();
+//  else
+//  onSuccessfulLogin.push(function() { webSocket.create(); });
+    return webSocket;
+  }
+
+  function zinikiGet(url, success, failure) {
+    jQuery.ajax({
+      type: "GET",
+      url: url,
+      headers: {
+        "Accept": "application/json",
+        "X-Ziniki-Token": token
+      },
+      success: function(json, status, xhr) {
+        if (success != null)
+          success(json, xhr);
+      },
+      error: function(xhr, text, error) {
+        if (failure != null)
+          failure(error, xhr);
+      }
+    });
+  };
+
+  function zinikiPost(url, payload, success, failure) {
+    var options = {
+        type: "POST",
+        headers: {
+          "Accept": "application/json"
+        },
+        success: function(json, status, xhr) {
+          if (success != null)
+            success(json, xhr);
+        },
+        error: function(xhr, text, error) {
+          console.log("Saw error ", text, error);
+          if (failure != null)
+            failure(xhr);
+        }
+    };
+    if (token != null) {
+      options.headers["X-Ziniki-Token"] = token;
+    }
+    if (payload != null) {
+      options.data = JSON.stringify(payload);
+      options.dataType = 'json';
+      options.contentType = 'application/json';
+    }
+    jQuery.ajax(url, options);
+  };
+
+  function login(method, username, options, success, failure) {
+    performingLogin = true;
+
+    var ret = Ember.RSVP.defer();
+    if (method == "openid") {
+      zinikiGet(url+'/login?method=openid&provider='+options.provider, handleSuccess, function() { performingLogin = false; if (failure) failure(arguments); });
+    } else {
+      var hash = $.extend({"method":method,"login":username}, options);
+      var loginPacket = {"ZinikiCredential":hash};
+      zinikiPost(url+'/login', loginPacket, handleSuccess, failure);
+    }
+
+    return ret.promise;
+
+    // On success, we want to come back here and let everybody know the good news.
+    // This includes people who were waiting while we were doing the round trip
+    function handleSuccess(json, xhr) {
+      performingLogin = false;
+      token = xhr.getResponseHeader("X-Ziniki-Token");
+      ret.resolve();
+      if (success)
+        success(json);
+//    for (var i=0;i<onSuccessfulLogin.length;i++)
+//    onSuccessfulLogin[i]();
+//    onSuccessfulLogin = [];
+    }
+
+  };
+
+  function logout() {
+    zinikiPost(url+"/logout", null, null, null);
+  }
+
+  // If you already have a token, you can call this
+  function reuseToken(inToken) {
+    token = inToken;
+  };
+
+  // This creates a new credential
+  function newCredential(method, username, options, success, failure) {
+    var kvoptions = [];
+    for (var k in options) {
+      if (options.hasOwnProperty(k))
+        kvoptions.push({"Option":{"key":k,"value":options[k]}});
+    }
+    var hash = $.extend({"method":method,"login":username}, {"options":kvoptions});
+    var credPacket = {"org.ziniki.builtin.commands.CaOpArgs": hash};
+    zinikiPost(url+'/org.ziniki.builtin/ca/newCredential', credPacket, success, failure);
+  };
+
+  // With a new credential, comes (potentially) a new identity.
+  // Note: you must already be logged in
+  function createIdentity(success, failure) {
+    zinikiPost(url+'/org.ziniki.builtin/ca/createIdentity', null, success, failure);
+  };
+
+  // Authorize an application
+  function authorize(app, success, failure) {
+    zinikiPost(url+'/org.ziniki.builtin/ca/authorize', {"org.ziniki.builtin.commands.CaOpArgs": {"application":app}}, success, failure);
+  };
+
+  function assembleUrl(app, prot, resource, id, method) {
+    var rest = url;
+    if (app != null)
+      rest += "/"+app;
+    if (prot != null)
+      rest += "/"+prot;
+    if (resource != null) {
+      rest += "/"+resource;
+      if (id != null)
+        rest += "/"+id;
+    }
+    if (method != null)
+      rest += "/"+method;
+    return rest;
+  };
+
+  function zinikiGetResource(app, prot, resource, id, success, failure) {
+    var rest = assembleUrl(app, prot, resource, id);
+    zinikiGet(rest, success, failure);
+  }
+
+  function zinikiSave(app, prot, resource, id, data, success, failure) {
+    var rest = assembleUrl(app, prot, resource, id);
+    zinikiPost(rest, data, success, failure);
+  }
+
+  function zinikiCall(app, prot, method, data, success, failure) {
+    var rest = assembleUrl(app, prot, null, null, method);
+    zinikiPost(rest, data, success, failure);
+  }
+
+  function zinikiInvoke(app, prot, resource, id, method, data, success, failure) {
+    var rest = assembleUrl(app, prot, resource, id, method);
+    zinikiPost(rest, data, success, failure);
+  }
+
+  Ziniki = {
+      init: init,
+      login: login,
+      logout: logout,
+      reuseToken: reuseToken,
+      newCredential: newCredential,
+      createIdentity: createIdentity,
+      authorize: authorize,
+      get: zinikiGetResource,
+      call: zinikiCall,
+      invoke: zinikiInvoke,
+      save: zinikiSave,
+      getWebSocket: getWebSocket
+  };
+
   return Ziniki;
 });
\ No newline at end of file

From 0a7054c9d9a8bf2a283f2fcba08c97b385fcb380 Mon Sep 17 00:00:00 2001
From: Gareth Powell <gmmapowell@yahoo.com>
Date: Fri, 25 Oct 2013 07:38:22 -0400
Subject: [PATCH 2/2] Used latest ziniki.js

---
 vendor/ziniki/glazier-overrides.js |   2 +-
 vendor/ziniki/ziniki.js            | 297 +++++++++++++++++++----------
 2 files changed, 193 insertions(+), 106 deletions(-)

diff --git a/vendor/ziniki/glazier-overrides.js b/vendor/ziniki/glazier-overrides.js
index f65576b..07b0748 100644
--- a/vendor/ziniki/glazier-overrides.js
+++ b/vendor/ziniki/glazier-overrides.js
@@ -4,7 +4,7 @@ define("glazier/behaviors/login",
     "use strict";
     function login() {
       // There should be a proper login screen
-      return Ziniki.login("basic", "gareth", { password:"powell"});
+      return Ziniki.login("gareth", "powell");
     }
     return login;
   }
diff --git a/vendor/ziniki/ziniki.js b/vendor/ziniki/ziniki.js
index 8d7ce91..8d70b79 100644
--- a/vendor/ziniki/ziniki.js
+++ b/vendor/ziniki/ziniki.js
@@ -3,14 +3,67 @@ define("ziniki",
 
   "use strict";
 
+/* Interface to Ziniki from JavaScript
+ * (C) 2013 Ziniki Infrastructure Software, LLC
+ * Author: Gareth Powell
+ */
   var Ziniki = {};
+function getURLParameterByName(window, name)
+{
+	name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
+	var regexS = "[\\?&]" + name + "=([^&#]*)";
+	var regex = new RegExp(regexS);
+	var results = regex.exec(window.location.search);
+	if (results == null)
+		return "";
+	else
+		return decodeURIComponent(results[1].replace(/\+/g, " "));
+}
 
   var url = null;
   var wsUrl = null;
   var webSocket = null;
-  var token = null;
   var performingLogin = false;
-//var onSuccessfulLogin = [];
+
+  function setLoggedInUser(newValue)
+  {
+          sessionStorage.setItem("userName", newValue.name);
+          sessionStorage.setItem("userToken", newValue.token);
+  }
+
+  function clearLoggedInUser()
+  {
+          sessionStorage.removeItem("userName");
+          sessionStorage.removeItem("userToken");
+  }
+
+  function getLoggedInUser()
+  {
+          var name = sessionStorage.getItem("userName");
+          var token = sessionStorage.getItem("userToken");
+          return token ? new LoggedInUser(name, token) : null;
+  }
+
+  function getLoggedInUserName()
+  {
+          return getLoggedInUser().name;
+  }
+  
+  function getToken()
+  {
+          var user = getLoggedInUser();
+          return user ? user.token : null;
+  }
+
+  function hasToken()
+  {
+          return getToken() != null;
+  }
+
+    // If you already have a token, you can call this
+    function reuseToken(inToken) {
+          setLoggedInUser(new LoggedInUser(inToken, inToken));
+    };
 
   /** We need to keep track of all server requests by id
    * and then map those ids back to the requests so that
@@ -52,16 +105,16 @@ define("ziniki",
     };
 
     this.conn = function() {
-      if (!this._conn) {
+      if (!this._conn)
         this._conn = this.create();
-        return this._conn;
-      };
+      return this._conn;
     }
 
     /** Do the work to create a websocket: initialize atmosphere,
      * pass a request, and handle the "open" message
      */
     this.create = function() {
+      var token = getToken();
       if (token == null && !performingLogin)
         throw "Cannot open websocket until logged in";
       var self = this;
@@ -81,18 +134,8 @@ define("ziniki",
             // and then handle each incoming message
             onMessage: function(response) {
               var body = response.responseBody;
-              if (body == "Confirm") {
+              if (body == "Confirm")
                 resolve(actualConn);
-                // All replaced by promise
-//              if (onReady) {
-//              if (!obj)
-//              onReady(self);
-//              else
-//              onReady.apply(obj, [self]);
-//              }
-//              for (var i=0;i<self.delayed.length;i++)
-//              self.conn.push(self.delayed[i]);
-              }
               else
                 self.dispatch(body);
             }
@@ -123,7 +166,6 @@ define("ziniki",
   };
 
   /** Tell us how to find Ziniki
-   * 
    */
   function init(inUrl, inWsUrl) {
     url = inUrl;
@@ -141,101 +183,143 @@ define("ziniki",
 
     // We can't set up the websocket without a login token, but if that process
     // is already under way, don't complain, just wait for the response
-    if (token == null && !performingLogin)
+    if (getToken() == null && !performingLogin)
       throw "Cannot open websocket until logged in";
 
     // OK, create the websocket object
-    webSocket = new WebSocket();
-//  if (token != null)
-//  webSocket.create();
-//  else
-//  onSuccessfulLogin.push(function() { webSocket.create(); });
-    return webSocket;
+    return new WebSocket();
   }
 
-  function zinikiGet(url, success, failure) {
-    jQuery.ajax({
-      type: "GET",
-      url: url,
-      headers: {
-        "Accept": "application/json",
-        "X-Ziniki-Token": token
-      },
-      success: function(json, status, xhr) {
-        if (success != null)
-          success(json, xhr);
-      },
-      error: function(xhr, text, error) {
-        if (failure != null)
-          failure(error, xhr);
-      }
-    });
+	function Response(xhr, json, textStatus)
+	{
+		this.xhr = xhr;
+		this.json = json;
+		this.status = status;
+	}
+	
+	function RequestError(xhr, textStatus, errorThrown)
+	{
+		this.name = "RequestError";
+		this.xhr = xhr;
+		this.textStatus = textStatus;
+		this.errorThrown = errorThrown;
+	}
+	RequestError.prototype = new Error("An error occurred while a request was being processed.");
+	
+	function zinikiGet(url)
+	{
+		return new Ember.RSVP.Promise(function(resolve, reject)
+			{
+				jQuery.ajax({
+					type: "GET",
+					url: url,
+					headers: {
+						"Accept": "application/json",
+						"X-Ziniki-Token": getToken()
+					},
+					success: function(json, textStatus, xhr) {	resolve(new Response(xhr, json, textStatus));	},
+					error: function(xhr, textStatus, errorThrown) {	reject(new RequestError(xhr, textStatus, errorThrown));	}
+				});
+			});
   };
 
-  function zinikiPost(url, payload, success, failure) {
-    var options = {
-        type: "POST",
-        headers: {
-          "Accept": "application/json"
-        },
-        success: function(json, status, xhr) {
-          if (success != null)
-            success(json, xhr);
-        },
-        error: function(xhr, text, error) {
-          console.log("Saw error ", text, error);
-          if (failure != null)
-            failure(xhr);
-        }
-    };
-    if (token != null) {
-      options.headers["X-Ziniki-Token"] = token;
-    }
-    if (payload != null) {
-      options.data = JSON.stringify(payload);
-      options.dataType = 'json';
-      options.contentType = 'application/json';
-    }
-    jQuery.ajax(url, options);
-  };
-
-  function login(method, username, options, success, failure) {
-    performingLogin = true;
-
-    var ret = Ember.RSVP.defer();
-    if (method == "openid") {
-      zinikiGet(url+'/login?method=openid&provider='+options.provider, handleSuccess, function() { performingLogin = false; if (failure) failure(arguments); });
-    } else {
-      var hash = $.extend({"method":method,"login":username}, options);
-      var loginPacket = {"ZinikiCredential":hash};
-      zinikiPost(url+'/login', loginPacket, handleSuccess, failure);
-    }
-
-    return ret.promise;
-
-    // On success, we want to come back here and let everybody know the good news.
-    // This includes people who were waiting while we were doing the round trip
-    function handleSuccess(json, xhr) {
-      performingLogin = false;
-      token = xhr.getResponseHeader("X-Ziniki-Token");
-      ret.resolve();
-      if (success)
-        success(json);
-//    for (var i=0;i<onSuccessfulLogin.length;i++)
-//    onSuccessfulLogin[i]();
-//    onSuccessfulLogin = [];
-    }
-
+	function zinikiPost(url, payload)
+	{
+		return new Ember.RSVP.Promise(function(resolve, reject)
+			{
+				var options =
+				{
+					type: "POST",
+					headers: {"Accept": "application/json"},
+					success: function(json, textStatus, xhr) {	resolve(new Response(xhr, json, textStatus));	},
+					error: function(xhr, textStatus, errorThrown) {	reject(new RequestError(xhr, textStatus, errorThrown));	}
+				};
+				
+				if (getToken() != null)
+					options.headers["X-Ziniki-Token"] = getToken();
+				
+				if (payload != null)
+				{
+					options.data = JSON.stringify(payload);
+					options.dataType = 'json';
+					options.contentType = 'application/json';
+				}
+				
+				jQuery.ajax(url, options);
+			});
   };
 
-  function logout() {
-    zinikiPost(url+"/logout", null, null, null);
+  function LoggedInUser(name, token)
+  {
+          this.name = name;
+          this.token = token;
   }
 
-  // If you already have a token, you can call this
-  function reuseToken(inToken) {
-    token = inToken;
-  };
+	function login(username, password)
+	{
+		var hash = {method: "basic", login: username, password: password};
+		var loginPacket = {"ZinikiCredential": hash};
+		var loginPromise = zinikiPost(url + "/login", loginPacket);
+		
+    performingLogin = true;
+		return loginPromise.then(
+			function(response)
+			{
+				var token = response.xhr.getResponseHeader("X-Ziniki-Token");
+				setLoggedInUser(new LoggedInUser(username, token));
+				performingLogin = false;
+			});
+	}
+	
+	function loginViaOpenID(window, providerString)
+	{
+	        performingLogin = true;
+		return new Ember.RSVP.Promise(function(resolve, reject)
+			{
+				var popupURL = url + "/login?method=openid&provider=" + encodeURIComponent(providerString) + "&returnTo=" + encodeURIComponent(window.location.origin + "/loggedIn.html");
+				var popup = window.open(popupURL);
+				
+				var intervalID = window.setInterval(function()
+					{
+						function cleanupAction()
+						{
+							window.clearInterval(intervalID);
+							popup.close();
+						}
+						
+						var loginIsComplete = false;
+						
+						try
+						{
+							loginIsComplete = popup.document && popup.document.domain === window.document.domain && popup.specialZinikiProperty4185809849535936024619905263 == 6986;
+						}
+						catch (error)	// the code above tries to gracefully set loginIsComplete to false while the popup is pointing to the provider's site, but
+						{					// there didn't seem to be a way to detect that condition (without triggering a security-related exception) in the case
+						}					// where the main window is using http and the provider is using https or vice versa...  so here that exception is quietly
+											// accepted as evidence that loginIsComplete should remain false
+						if (loginIsComplete)
+						{
+							var token = getURLParameterByName(popup, "token");
+							setLoggedInUser(new LoggedInUser("OpenID", token));
+							performingLogin = false;
+							cleanupAction();
+							resolve();
+						}
+						else if (popup.closed)
+						{
+							cleanupAction();
+							reject();
+						}
+					}, 64);
+			});
+	}
+
+	
+	function logout()
+	{
+		clearLoggedInUser();
+		return zinikiPost(url + "/logout", null);
+  }
 
   // This creates a new credential
   function newCredential(method, username, options, success, failure) {
@@ -276,14 +360,14 @@ define("ziniki",
     return rest;
   };
 
-  function zinikiGetResource(app, prot, resource, id, success, failure) {
+	function zinikiGetResource(app, prot, resource, id) {
     var rest = assembleUrl(app, prot, resource, id);
-    zinikiGet(rest, success, failure);
+		return zinikiGet(rest);
   }
 
-  function zinikiSave(app, prot, resource, id, data, success, failure) {
+	function zinikiSave(app, prot, resource, id, data) {
     var rest = assembleUrl(app, prot, resource, id);
-    zinikiPost(rest, data, success, failure);
+		return zinikiPost(rest, data);
   }
 
   function zinikiCall(app, prot, method, data, success, failure) {
@@ -299,7 +383,10 @@ define("ziniki",
   Ziniki = {
       init: init,
       login: login,
+	  loginViaOpenID: loginViaOpenID,
       logout: logout,
+      hasToken: hasToken,
+      getLoggedInUserName: getLoggedInUserName,
       reuseToken: reuseToken,
       newCredential: newCredential,
       createIdentity: createIdentity,