dojo-rails 0.9.9 → 0.9.10

data/vendor/assets/javascripts/dojo/store/DataStore.js.uncompressed.js

@@ -1,18 +1,24 @@
-define("dojo/store/DataStore", ["../_base/lang", "../_base/declare", "../_base/Deferred", "../_base/array", "./util/QueryResults"
-], function(lang,declare,Deferred,array,QueryResults) {
-	// module:
-	//		dojo/store/DataStore
-	// summary:
-	//		TODOC
+define("dojo/store/DataStore", [
+	"../_base/lang", "../_base/declare", "../_base/Deferred", "../_base/array",
+	"./util/QueryResults", "./util/SimpleQueryEngine" /*=====, "./api/Store" =====*/
+], function(lang, declare, Deferred, array, QueryResults, SimpleQueryEngine /*=====, Store =====*/){
+
+// module:
+//		dojo/store/DataStore
 
 
-return declare("dojo.store.DataStore", null, {
+// No base class, but for purposes of documentation, the base class is dojo/store/api/Store
+var base = null;
+/*===== base = Store; =====*/
+
+return declare("dojo.store.DataStore", base, {
+	// summary:
+	//		This is an adapter for using Dojo Data stores with an object store consumer.
+	//		You can provide a Dojo data store and use this adapter to interact with it through
+	//		the Dojo object store API
+
 	target: "",
 	constructor: function(options){
-		// summary:
-		//		This is an adapter for using Dojo Data stores with an object store consumer.
-		//		You can provide a Dojo data store and use this adapter to interact with it through
-		//		the Dojo object store API
 		// options: Object?
 		//		This provides any configuration information that will be mixed into the store,
 		//		including a reference to the Dojo data store under the property "store".
@@ -46,19 +52,42 @@ return declare("dojo.store.DataStore", null, {
 	// store:
 	//		The object store to convert to a data store
 	store: null,
+	// queryEngine: Function
+	//		Defines the query engine to use for querying the data store
+	queryEngine: SimpleQueryEngine,
+	
 	_objectConverter: function(callback){
 		var store = this.store;
 		var idProperty = this.idProperty;
-		return function(item){
+		function convert(item){
 			var object = {};
 			var attributes = store.getAttributes(item);
 			for(var i = 0; i < attributes.length; i++){
-				object[attributes[i]] = store.getValue(item, attributes[i]);
+				var attribute = attributes[i];
+				var values = store.getValues(item, attribute);
+				if(values.length > 1){
+					for(var j = 0; j < values.length; j++){
+						var value = values[j];
+						if(typeof value == 'object' && store.isItem(value)){
+							values[j] = convert(value);
+						}
+					}
+					value = values;
+				}else{
+					var value = store.getValue(item, attribute);
+					if(typeof value == 'object' && store.isItem(value)){
+						value = convert(value);
+					}
+				}
+				object[attributes[i]] = value;
 			}
-			if(!(idProperty in object)){
+			if(!(idProperty in object) && store.getIdentity){
 				object[idProperty] = store.getIdentity(item);
 			}
-			return callback(object);
+			return object;
+		}
+		return function(item){
+			return callback(convert(item));
 		};
 	},
 	get: function(id, options){
@@ -99,6 +128,7 @@ return declare("dojo.store.DataStore", null, {
 		var idProperty = this.idProperty;
 		if(typeof id == "undefined"){
 			store.newItem(object);
+			store.save();
 		}else{
 			store.fetchItemByIdentity({
 				identity: id,
@@ -113,6 +143,7 @@ return declare("dojo.store.DataStore", null, {
 					}else{
 						store.newItem(object);
 					}
+					store.save();
 				}
 			});
 		}
@@ -127,6 +158,7 @@ return declare("dojo.store.DataStore", null, {
 			identity: id,
 			onItem: function(item){
 				store.deleteItem(item);
+				store.save();
 			}
 		});
 	},
@@ -137,7 +169,7 @@ return declare("dojo.store.DataStore", null, {
 		//		The query to use for retrieving objects from the store
 		// options: Object?
 		//		Optional options object as used by the underlying dojo.data Store.
-		// returns: dojo.store.util.QueryResults
+		// returns: Store.QueryResults
 		//		A query results object that can be used to iterate over results.
 		var fetchHandle;
 		var deferred = new Deferred(function(){ fetchHandle.abort && fetchHandle.abort(); });

data/vendor/assets/javascripts/dojo/store/JsonRest.js

@@ -5,52 +5,56 @@
 */
 
 //>>built
-define("dojo/store/JsonRest",["../_base/xhr","../json","../_base/declare","./util/QueryResults"],function(_1,_2,_3,_4){
-return _3("dojo.store.JsonRest",null,{constructor:function(_5){
-_3.safeMixin(this,_5);
-},target:"",idProperty:"id",get:function(id,_6){
-var _7=_6||{};
-_7.Accept=this.accepts;
-return _1("GET",{url:this.target+id,handleAs:"json",headers:_7});
-},accepts:"application/javascript, application/json",getIdentity:function(_8){
-return _8[this.idProperty];
-},put:function(_9,_a){
-_a=_a||{};
-var id=("id" in _a)?_a.id:this.getIdentity(_9);
-var _b=typeof id!="undefined";
-return _1(_b&&!_a.incremental?"PUT":"POST",{url:_b?this.target+id:this.target,postData:_2.stringify(_9),handleAs:"json",headers:{"Content-Type":"application/json",Accept:this.accepts,"If-Match":_a.overwrite===true?"*":null,"If-None-Match":_a.overwrite===false?"*":null}});
-},add:function(_c,_d){
-_d=_d||{};
-_d.overwrite=false;
-return this.put(_c,_d);
-},remove:function(id){
-return _1("DELETE",{url:this.target+id});
-},query:function(_e,_f){
-var _10={Accept:this.accepts};
+define("dojo/store/JsonRest",["../_base/xhr","../_base/lang","../json","../_base/declare","./util/QueryResults"],function(_1,_2,_3,_4,_5){
+var _6=null;
+return _4("dojo.store.JsonRest",_6,{constructor:function(_7){
+this.headers={};
+_4.safeMixin(this,_7);
+},headers:{},target:"",idProperty:"id",get:function(id,_8){
+_8=_8||{};
+var _9=_2.mixin({Accept:this.accepts},this.headers,_8.headers||_8);
+return _1("GET",{url:this.target+id,handleAs:"json",headers:_9});
+},accepts:"application/javascript, application/json",getIdentity:function(_a){
+return _a[this.idProperty];
+},put:function(_b,_c){
+_c=_c||{};
+var id=("id" in _c)?_c.id:this.getIdentity(_b);
+var _d=typeof id!="undefined";
+return _1(_d&&!_c.incremental?"PUT":"POST",{url:_d?this.target+id:this.target,postData:_3.stringify(_b),handleAs:"json",headers:_2.mixin({"Content-Type":"application/json",Accept:this.accepts,"If-Match":_c.overwrite===true?"*":null,"If-None-Match":_c.overwrite===false?"*":null},this.headers,_c.headers)});
+},add:function(_e,_f){
 _f=_f||{};
-if(_f.start>=0||_f.count>=0){
-_10.Range="items="+(_f.start||"0")+"-"+(("count" in _f&&_f.count!=Infinity)?(_f.count+(_f.start||0)-1):"");
+_f.overwrite=false;
+return this.put(_e,_f);
+},remove:function(id,_10){
+_10=_10||{};
+return _1("DELETE",{url:this.target+id,headers:_2.mixin({},this.headers,_10.headers)});
+},query:function(_11,_12){
+_12=_12||{};
+var _13=_2.mixin({Accept:this.accepts},this.headers,_12.headers);
+if(_12.start>=0||_12.count>=0){
+_13.Range=_13["X-Range"]="items="+(_12.start||"0")+"-"+(("count" in _12&&_12.count!=Infinity)?(_12.count+(_12.start||0)-1):"");
 }
-if(_e&&typeof _e=="object"){
-_e=_1.objectToQuery(_e);
-_e=_e?"?"+_e:"";
+var _14=this.target.indexOf("?")>-1;
+if(_11&&typeof _11=="object"){
+_11=_1.objectToQuery(_11);
+_11=_11?(_14?"&":"?")+_11:"";
 }
-if(_f&&_f.sort){
-var _11=this.sortParam;
-_e+=(_e?"&":"?")+(_11?_11+"=":"sort(");
-for(var i=0;i<_f.sort.length;i++){
-var _12=_f.sort[i];
-_e+=(i>0?",":"")+(_12.descending?"-":"+")+encodeURIComponent(_12.attribute);
+if(_12&&_12.sort){
+var _15=this.sortParam;
+_11+=(_11||_14?"&":"?")+(_15?_15+"=":"sort(");
+for(var i=0;i<_12.sort.length;i++){
+var _16=_12.sort[i];
+_11+=(i>0?",":"")+(_16.descending?"-":"+")+encodeURIComponent(_16.attribute);
 }
-if(!_11){
-_e+=")";
+if(!_15){
+_11+=")";
 }
 }
-var _13=_1("GET",{url:this.target+(_e||""),handleAs:"json",headers:_10});
-_13.total=_13.then(function(){
-var _14=_13.ioArgs.xhr.getResponseHeader("Content-Range");
-return _14&&(_14=_14.match(/\/(.*)/))&&+_14[1];
+var _17=_1("GET",{url:this.target+(_11||""),handleAs:"json",headers:_13});
+_17.total=_17.then(function(){
+var _18=_17.ioArgs.xhr.getResponseHeader("Content-Range");
+return _18&&(_18=_18.match(/\/(.*)/))&&+_18[1];
 });
-return _4(_13);
+return _5(_17);
 }});
 });

data/vendor/assets/javascripts/dojo/store/JsonRest.js.uncompressed.js

@@ -1,74 +1,98 @@
-define("dojo/store/JsonRest", ["../_base/xhr", "../json", "../_base/declare", "./util/QueryResults"
-], function(xhr, JSON, declare, QueryResults) {
-  //  module:
-  //    dojo/store/JsonRest
-  //  summary:
-  //    The module defines a JSON/REST based object store 
-
-return declare("dojo.store.JsonRest", null, {
+define("dojo/store/JsonRest", ["../_base/xhr", "../_base/lang", "../json", "../_base/declare", "./util/QueryResults" /*=====, "./api/Store" =====*/
+], function(xhr, lang, JSON, declare, QueryResults /*=====, Store =====*/){
+
+// No base class, but for purposes of documentation, the base class is dojo/store/api/Store
+var base = null;
+/*===== base = Store; =====*/
+
+/*=====
+var __HeaderOptions = {
+		// headers: Object?
+		//		Additional headers to send along with the request.
+	},
+	__PutDirectives = declare(Store.PutDirectives, __HeaderOptions),
+	__QueryOptions = declare(Store.QueryOptions, __HeaderOptions);
+=====*/
+
+return declare("dojo.store.JsonRest", base, {
 	// summary:
 	//		This is a basic store for RESTful communicating with a server through JSON
-	//		formatted data. It implements dojo.store.api.Store.
+	//		formatted data. It implements dojo/store/api/Store.
 
-	constructor: function(/*dojo.store.JsonRest*/ options){
+	constructor: function(options){
 		// summary:
 		//		This is a basic store for RESTful communicating with a server through JSON
 		//		formatted data.
-		// options:
+		// options: dojo/store/JsonRest
 		//		This provides any configuration information that will be mixed into the store
+		this.headers = {};
 		declare.safeMixin(this, options);
 	},
+
+	// headers: Object
+	//		Additional headers to pass in all requests to the server. These can be overridden
+	//		by passing additional headers to calls to the store.
+	headers: {},
+
 	// target: String
 	//		The target base URL to use for all requests to the server. This string will be
-	// 	prepended to the id to generate the URL (relative or absolute) for requests
-	// 	sent to the server
+	//		prepended to the id to generate the URL (relative or absolute) for requests
+	//		sent to the server
 	target: "",
+
 	// idProperty: String
 	//		Indicates the property to use as the identity property. The values of this
 	//		property should be unique.
 	idProperty: "id",
+
 	// sortParam: String
-	// 		The query parameter to used for holding sort information. If this is omitted, than
-	//		the sort information is included in a functional query token to avoid colliding 
-	// 		with the set of name/value pairs.
-	
+	//		The query parameter to used for holding sort information. If this is omitted, than
+	//		the sort information is included in a functional query token to avoid colliding
+	//		with the set of name/value pairs.
+
 	get: function(id, options){
-		//	summary:
+		// summary:
 		//		Retrieves an object by its identity. This will trigger a GET request to the server using
 		//		the url `this.target + id`.
-		//	id: Number
+		// id: Number
 		//		The identity to use to lookup the object
-		//	returns: Object
+		// options: Object?
+		//		HTTP headers. For consistency with other methods, if a `headers` key exists on this object, it will be
+		//		used to provide HTTP headers instead.
+		// returns: Object
 		//		The object in the store that matches the given id.
-		var headers = options || {};
-		headers.Accept = this.accepts;
+		options = options || {};
+		var headers = lang.mixin({ Accept: this.accepts }, this.headers, options.headers || options);
 		return xhr("GET", {
-			url:this.target + id,
+			url: this.target + id,
 			handleAs: "json",
 			headers: headers
 		});
 	},
+
 	// accepts: String
 	//		Defines the Accept header to use on HTTP requests
-	accepts: "application/javascript, application/json", 
+	accepts: "application/javascript, application/json",
+
 	getIdentity: function(object){
 		// summary:
 		//		Returns an object's identity
 		// object: Object
 		//		The object to get the identity from
-		//	returns: Number
+		// returns: Number
 		return object[this.idProperty];
 	},
+
 	put: function(object, options){
 		// summary:
 		//		Stores an object. This will trigger a PUT request to the server
 		//		if the object has an id, otherwise it will trigger a POST request.
 		// object: Object
 		//		The object to store.
-		// options: dojo.store.api.Store.PutDirectives?
+		// options: __PutDirectives?
 		//		Additional metadata for storing the data.  Includes an "id"
 		//		property if a specific id is to be used.
-		//	returns: Number
+		// returns: dojo/_base/Deferred
 		options = options || {};
 		var id = ("id" in options) ? options.id : this.getIdentity(object);
 		var hasId = typeof id != "undefined";
@@ -76,61 +100,71 @@ return declare("dojo.store.JsonRest", null, {
 				url: hasId ? this.target + id : this.target,
 				postData: JSON.stringify(object),
 				handleAs: "json",
-				headers:{
+				headers: lang.mixin({
 					"Content-Type": "application/json",
 					Accept: this.accepts,
 					"If-Match": options.overwrite === true ? "*" : null,
 					"If-None-Match": options.overwrite === false ? "*" : null
-				}
+				}, this.headers, options.headers)
 			});
 	},
+
 	add: function(object, options){
 		// summary:
 		//		Adds an object. This will trigger a PUT request to the server
 		//		if the object has an id, otherwise it will trigger a POST request.
 		// object: Object
 		//		The object to store.
-		// options: dojo.store.api.Store.PutDirectives?
+		// options: __PutDirectives?
 		//		Additional metadata for storing the data.  Includes an "id"
 		//		property if a specific id is to be used.
 		options = options || {};
 		options.overwrite = false;
 		return this.put(object, options);
 	},
-	remove: function(id){
+
+	remove: function(id, options){
 		// summary:
 		//		Deletes an object by its identity. This will trigger a DELETE request to the server.
 		// id: Number
 		//		The identity to use to delete the object
-		return xhr("DELETE",{
-			url:this.target + id
+		// options: __HeaderOptions?
+		//		HTTP headers.
+		options = options || {};
+		return xhr("DELETE", {
+			url: this.target + id,
+			headers: lang.mixin({}, this.headers, options.headers)
 		});
 	},
+
 	query: function(query, options){
 		// summary:
 		//		Queries the store for objects. This will trigger a GET request to the server, with the
 		//		query added as a query string.
 		// query: Object
 		//		The query to use for retrieving objects from the store.
-		//	options: dojo.store.api.Store.QueryOptions?
+		// options: __QueryOptions?
 		//		The optional arguments to apply to the resultset.
-		//	returns: dojo.store.api.Store.QueryResults
+		// returns: Store.QueryResults
 		//		The results of the query, extended with iterative methods.
-		var headers = {Accept: this.accepts};
 		options = options || {};
 
+		var headers = lang.mixin({ Accept: this.accepts }, this.headers, options.headers);
+
 		if(options.start >= 0 || options.count >= 0){
-			headers.Range = "items=" + (options.start || '0') + '-' +
+			headers.Range = headers["X-Range"] //set X-Range for Opera since it blocks "Range" header
+				 = "items=" + (options.start || '0') + '-' +
 				(("count" in options && options.count != Infinity) ?
 					(options.count + (options.start || 0) - 1) : '');
 		}
+		var hasQuestionMark = this.target.indexOf("?") > -1;
 		if(query && typeof query == "object"){
 			query = xhr.objectToQuery(query);
-			query = query ? "?" + query: "";
+			query = query ? (hasQuestionMark ? "&" : "?") + query: "";
 		}
 		if(options && options.sort){
 			var sortParam = this.sortParam;
-			query += (query ? "&" : "?") + (sortParam ? sortParam + '=' : "sort(");
+			query += (query || hasQuestionMark ? "&" : "?") + (sortParam ? sortParam + '=' : "sort(");
 			for(var i = 0; i<options.sort.length; i++){
 				var sort = options.sort[i];
 				query += (i > 0 ? "," : "") + (sort.descending ? '-' : '+') + encodeURIComponent(sort.attribute);
@@ -146,7 +180,7 @@ return declare("dojo.store.JsonRest", null, {
 		});
 		results.total = results.then(function(){
 			var range = results.ioArgs.xhr.getResponseHeader("Content-Range");
-			return range && (range=range.match(/\/(.*)/)) && +range[1];
+			return range && (range = range.match(/\/(.*)/)) && +range[1];
 		});
 		return QueryResults(results);
 	}

data/vendor/assets/javascripts/dojo/store/Memory.js

@@ -6,50 +6,51 @@
 
 //>>built
 define("dojo/store/Memory",["../_base/declare","./util/QueryResults","./util/SimpleQueryEngine"],function(_1,_2,_3){
-return _1("dojo.store.Memory",null,{constructor:function(_4){
-for(var i in _4){
-this[i]=_4[i];
+var _4=null;
+return _1("dojo.store.Memory",_4,{constructor:function(_5){
+for(var i in _5){
+this[i]=_5[i];
 }
 this.setData(this.data||[]);
 },data:null,idProperty:"id",index:null,queryEngine:_3,get:function(id){
 return this.data[this.index[id]];
-},getIdentity:function(_5){
-return _5[this.idProperty];
-},put:function(_6,_7){
-var _8=this.data,_9=this.index,_a=this.idProperty;
-var id=(_7&&"id" in _7)?_7.id:_a in _6?_6[_a]:Math.random();
-if(id in _9){
-if(_7&&_7.overwrite===false){
+},getIdentity:function(_6){
+return _6[this.idProperty];
+},put:function(_7,_8){
+var _9=this.data,_a=this.index,_b=this.idProperty;
+var id=_7[_b]=(_8&&"id" in _8)?_8.id:_b in _7?_7[_b]:Math.random();
+if(id in _a){
+if(_8&&_8.overwrite===false){
 throw new Error("Object already exists");
 }
-_8[_9[id]]=_6;
+_9[_a[id]]=_7;
 }else{
-_9[id]=_8.push(_6)-1;
+_a[id]=_9.push(_7)-1;
 }
 return id;
-},add:function(_b,_c){
-(_c=_c||{}).overwrite=false;
-return this.put(_b,_c);
+},add:function(_c,_d){
+(_d=_d||{}).overwrite=false;
+return this.put(_c,_d);
 },remove:function(id){
-var _d=this.index;
-var _e=this.data;
-if(id in _d){
-_e.splice(_d[id],1);
-this.setData(_e);
+var _e=this.index;
+var _f=this.data;
+if(id in _e){
+_f.splice(_e[id],1);
+this.setData(_f);
 return true;
 }
-},query:function(_f,_10){
-return _2(this.queryEngine(_f,_10)(this.data));
-},setData:function(_11){
-if(_11.items){
-this.idProperty=_11.identifier;
-_11=this.data=_11.items;
+},query:function(_10,_11){
+return _2(this.queryEngine(_10,_11)(this.data));
+},setData:function(_12){
+if(_12.items){
+this.idProperty=_12.identifier;
+_12=this.data=_12.items;
 }else{
-this.data=_11;
+this.data=_12;
 }
 this.index={};
-for(var i=0,l=_11.length;i<l;i++){
-this.index[_11[i][this.idProperty]]=i;
+for(var i=0,l=_12.length;i<l;i++){
+this.index[_12[i][this.idProperty]]=i;
 }
 }});
 });