kojac 0.9.1 → 0.11.0

data/app/assets/javascripts/kojac_canjs.js

@@ -122,47 +122,47 @@
 //		return value;
 //	},
 
-	get: function(k) {
+	retrieve: function(k) {
 		return this.attr(k);
 	},
-	set: function(k,v) {
+	store: function(k,v) {
 		return this.attr(k,v);
 	},
 
-	cacheResults: function(aRequest) {
-		console.log('BEGIN cacheResults')
-		var results = {};
-		var deletes = [];
-		for (var i=0;i<aRequest.ops.length;i++) {
-			var op = aRequest.ops[i];
-			if (op.error)
-				break;
-			if (op.options.cacheResults===false)
-				continue;
-			for (p in op.results) {
-				var v = op.results[p];
-				results[p] = v;
-				if (v===undefined)
-					deletes.push(p);
-				else
-					deletes = _.without(deletes, [p]);
-			}
-		}
-		for (p in results) {
-			try {
-				this.attr(p,results[p]);
-			} catch (e) {
-				console.log('Error when caching '+p+' : '+ e.message);
-			}
-		}
-//		if (deletes.length) {
-//			for (var i=0;i<deletes.length;i++) {
-//				console.log('cacheResults remove');
-//				this.removeAttr(deletes[i]);
+//	cacheResults: function(aRequest) {
+//		console.log('BEGIN cacheResults')
+//		var results = {};
+//		var deletes = [];
+//		for (var i=0;i<aRequest.ops.length;i++) {
+//			var op = aRequest.ops[i];
+//			if (op.error)
+//				break;
+//			if (op.options.cacheResults===false)
+//				continue;
+//			for (p in op.results) {
+//				var v = op.results[p];
+//				results[p] = v;
+//				if (v===undefined)
+//					deletes.push(p);
+//				else
+//					deletes = _.without(deletes, [p]);
 //			}
 //		}
-		console.log('END cacheResults');
-	},
+//		for (p in results) {
+//			try {
+//				this.attr(p,results[p]);
+//			} catch (e) {
+//				console.log('Error when caching '+p+' : '+ e.message);
+//			}
+//		}
+////		if (deletes.length) {
+////			for (var i=0;i<deletes.length;i++) {
+////				console.log('cacheResults remove');
+////				this.removeAttr(deletes[i]);
+////			}
+////		}
+//		console.log('END cacheResults');
+//	},
 
 	collectIds: function(aPrefix, aIds) {
 		return Kojac.collectIds(aPrefix,aIds,this);

data/app/assets/javascripts/kojac_ember.js

@@ -72,147 +72,89 @@ Kojac.EmberObjectFactory = Kojac.Object.extend({
 		var newClass = this.emberClassFromKey(aKey);
 		var result = [];
 		for (var i=0; i<aArray.length; i++) {
-			var newv = new newClass();
-			newv.setProperties(aArray[i]);
+			var newv = newClass.create(aArray[i]);
 			result.push(newv);
 		}
 		return result;
 	},
 
-	emberObjectFactory: function(aObject,aKey) {
+	manufacture: function(aObject,aKey) {
 		var newClass = this.emberClassFromKey(aKey);
-		var newv = new newClass();
-		newv.setProperties(aObject);
+		var newv = newClass.create(aObject);
 		return newv;
-	},
-
-	transformResultsToValueObjects: function(aRequest) {
-		for (var i=0;i<aRequest.ops.length;i++) {
-			var op = aRequest.ops[i];
-			if (op.error)
-				break;
-			for (var k in op.results) {
-				var v = op.results[k];
-				if (!jQuery.isPlainObject(v))
-					continue;
-				op.results[k] = this.emberObjectFactory(v,k);
-			}
-		}
 	}
 
 });
 
-
-
-//ExampleRemoteProvider = Ember.Object.extend({
-//Kojac.RemoteProvider = Kojac.Object.extend({
-//
-//	useMockFileValues: false,
-//  mockFilePath: '',
-//	mockReadOperationHandler: null,
-//	mockWriteOperationHandler: function(aOp) {
-//		log.debug(JSON.stringify(EmberUtils.copyProperties({},aOp,null,['request'])));
-//	},
-//
-//	handleOperationFromFiles: function(aRequest) {
-//		var op = aRequest.handlers.parameter;
-//
-//		if (op.verb==='READ' || op.verb==='EXECUTE') {
-//			if (this.mockReadOperationHandler) {
-//				this.mockReadOperationHandler(op);
-//			} else {
-//				aRequest.handlers.waitForCallNext = true;
-//				var fp = mockFilePath+op.key+'.js';
-//				var data = null;
-//				jQuery.ajax({url: fp, dataType: 'json', cache: false, data: data}).done(
-//					function( aData ) {
-//						for (p in aData)
-//							op[p] = aData[p];
-//						aRequest.handlers.callNext();
-//					}
-//				).fail(
-//					function(jqXHR, textStatus) {
-//						aRequest.handlers.handleError(textStatus);
-//					}
-//				);
-//			}
-//		} else {
-//			if (this.mockWriteOperationHandler)
-//				this.mockWriteOperationHandler(op);
-//		}
-//	},
-//
-//	handleAjaxRequest: function(aRequest) {
-//		var op = aRequest.parameter;
-//		aRequest.handlers.waitForCallNext = true;
-//		jQuery.ajax({},function(){
-//			aRequest.handlers.callNext();
-//		})
-//	},
-//
-//	addRequestHandlers: function(aRequest) {
-//		if (this.useMockFileValues) {
-//			for (var i=0;i<aRequest.ops.length;i++)
-//				aRequest.handlers.add(this.handleOperationFromFiles,aRequest.ops[i],this);
-//		} else {
-//			aRequest.handlers.add(this.handleAjaxRequest,null,this);
-//		}
-//	}
-//
-//});
-
-
 Kojac.EmberModel = Ember.Object.extend({});
 
-Kojac.EmberModel.reopenClass({
+Kojac.EmberModel.TypedField = function() {
+  this.get = function(obj,keyName) {    // Here code was copied from Ember get to avoid endless recursion. This is more efficient but brittle for future Ember versions
+	  var meta = Ember.meta(obj),
+		  desc = (meta && meta.descs[keyName]),
+		  ret;
+	  if (Ember.ENV.MANDATORY_SETTER && meta && (meta.watching[keyName] > 0)) {
+		  ret = meta.values[keyName];
+	  } else {
+		  ret = obj[keyName];
+	  }
+	  if ((ret === undefined) &&
+		  ('object' === typeof obj) && !(keyName in obj) && ('function' === typeof obj.unknownProperty)) {
+		  return obj.unknownProperty(keyName);
+	  }
+	  return ret;
+  }
+	this.set = function(obj,keyName,aValue) {   // here we call the standard method after removing the desc to prevent endless recursion, then put it back.
+		var result;
+		var def = obj.constructor.getDefinitions();
+		var t = (def && def[keyName]);
+		if (t)
+			aValue = Kojac.interpretValueAsType(aValue,t);
+		var meta = Ember.meta(obj),
+			desc = (meta && meta.descs[keyName]);
+		meta.descs[keyName] = undefined;
+		try {
+			result = Ember.set(obj,keyName,aValue);
+		}
+		finally {
+			meta.descs[keyName] = desc;
+		}
+		return result;
+	}
+};
+Kojac.EmberModel.TypedField.prototype = new Ember.Descriptor();
 
-	//_extend: Ember.Object.extend,
+Kojac.EmberModel.reopenClass({
 
 	extend: function() {
 		var defs = arguments[0];
 		var extender = {};
 		var definitions = this.getDefinitions();
 		var defaults = this.getDefaults();
+
 		var _type;
 		var _value;
 		//var _init;
 		if (defs) {
 			for (p in defs) {
 				var pValue = defs[p];
-//				if (p=='init') {
-//					_init = pValue;
-//				} else {
-					if (Kojac.FieldTypes.indexOf(pValue)>=0) { // pValue is field type
-						definitions[p] = pValue;
-						defaults[p] = null;
-						extender[p] = null;
-					} else {
-						var ft=Kojac.getPropertyValueType(pValue);
-						if (ft && (Kojac.SimpleTypes.indexOf(ft)>=0)) {  // pValue is simple field value
-							definitions[p] = ft;
-							defaults[p] = pValue;
-							extender[p] = pValue;
-						} else {  // pValue is something else
-							//definitions[p] = _type;
-							//defaults[p] = _value;
-							extender[p] = pValue;
-						}
+				if (Kojac.FieldTypes.indexOf(pValue)>=0) { // pValue is field type
+					definitions[p] = pValue;
+					defaults[p] = null;
+					extender[p] = null;
+				} else {
+					var ft=Kojac.getPropertyValueType(pValue);
+					if (ft && (Kojac.SimpleTypes.indexOf(ft)>=0)) {  // pValue is simple field value
+						definitions[p] = ft;
+						defaults[p] = pValue;
+						extender[p] = pValue;
+					} else {  // pValue is something else
+						//definitions[p] = _type;
+						//defaults[p] = _value;
+						extender[p] = pValue;
 					}
-	//			}
+				}
 			}
-//			extender.init = function() {  // we need to call the super init, then initialise default values, then call the given init
-//				this._super();
-//				//var defaults = this.constructor.getDefaults();
-//				//for (dp in defaults)
-//				//	this[dp] = defaults[dp];
-//				if (_init) {
-//					var _super = this._super;
-//					this._super = function() {};  // temporarily disable _super to make init function work like normal ember init
-//					_init.call(this);
-//					if (_super)
-//						this._super = _super;       // restore _super
-//				}
-//			};
 		}
 		var result = this._super(extender);
 		result.setDefinitions(definitions);
@@ -236,13 +178,26 @@ Kojac.EmberModel.reopenClass({
 		return this._defaults || {};
 	},
 
+	__addDescs: function(aNewInstance){
+		var meta = Ember.meta(aNewInstance);
+		var defs = this.getDefinitions();
+		if (defs) {
+			for (p in defs) {
+				meta.descs[p] = new Kojac.EmberModel.TypedField(aNewInstance);
+			}
+		}
+	},
+
+
 	__createWithMixins: Kojac.EmberModel.createWithMixins,
 	createWithMixins: function() {
 		var inputs = arguments;
 		if (inputs.length) {
 			inputs[0] = Kojac.readTypedProperties({},inputs[0],this.getDefinitions());
 		}
-		return this.__createWithMixins.apply(this,inputs);
+		var result = this.__createWithMixins.apply(this,inputs);
+		this.__addDescs(result);
+		return result;
   },
 
 	__create: Kojac.EmberModel.create,
@@ -251,7 +206,9 @@ Kojac.EmberModel.reopenClass({
 		if (inputs.length) {
 			inputs[0] = Kojac.readTypedProperties({},inputs[0],this.getDefinitions());
 		}
-		return this.__create.apply(this,inputs);
+		var result = this.__create.apply(this,inputs);
+		this.__addDescs(result);
+		return result;
 	}
 
 });
@@ -273,28 +230,40 @@ Kojac.EmberModel.reopen({
 		return this.___setProperties(this,values);
 	},
 
-	toObject: function(aOptions) {
-		var result = {};
-		var defs = this.constructor.getDefinitions();
-		var includes = aOptions && aOptions.include
-		for (var p in defs)
-			result[p] = this.get(p);
-		if (includes) {
-			includes = this.getProperties(includes);
-			var v;
-			for (var p in includes) {
-				v = includes[p];
-				if (v && (typeof(v)=="object") && ("toObject" in v))
-					includes[p] = v.toObject();
-			}
-			_.extend(result,includes);
-		}
-		return result;
+	// copy the property from source to dest
+	// this could be a static fn
+	toJsonoCopyFn: function(aDest,aSource,aProperty,aOptions) {
+		aDest[aProperty] = Kojac.Utils.toJsono(Ember.get(aSource,aProperty),aOptions);
+	},
+
+	// return array of names, or an object and all keys will be used
+	// this could be a static fn
+	toPropListFn: function(aSource,aOptions) {
+		if ("getDefinitions" in aSource.constructor)
+			return aSource.constructor.getDefinitions();  // return an object to use all keys from
+		else
+			return aSource;    // this is a simple object, so use all keys
+	},
+
+	toJsono: function(aOptions) {
+		return Kojac.Utils.toJsono(this,aOptions,this.toPropListFn,this.toJsonoCopyFn)
+//		for (var p in defs)
+//			result[p] = this.get(p);
+//		if (includes) {
+//			includes = this.getProperties(includes);
+//			var v;
+//			for (var p in includes) {
+//				v = includes[p];
+//				if (v && (typeof(v)=="object") && ("toJsono" in v))
+//					includes[p] = v.toJsono();
+//			}
+//			_.extend(result,includes);
+//		}
+//		return result;
 	}
 
 });
 
-
 Kojac.EmberCache = Ember.Object.extend({
 
 	generateKey: function(aPrefix) {
@@ -315,28 +284,17 @@ Kojac.EmberCache = Ember.Object.extend({
 		return id;
 	},
 
-	store: function(aKeysValues) {
-		this.beginPropertyChanges();
-		for (p in aKeysValues) {
-			if (aKeysValues[p]===undefined) {
-				this.set(p,undefined);
-				delete this[p];
-			} else {
-				this.set(p,aKeysValues[p]);
-			}
-		}
-		this.endPropertyChanges();
+	retrieve: function(k) {
+		return this.get(k);
 	},
 
-	cacheResults: function(aRequest) {
+	store: function(k,v) {
 		this.beginPropertyChanges();
-		for (var i=0;i<aRequest.ops.length;i++) {
-			var op = aRequest.ops[i];
-			if (op.error)
-				break;
-			if (op.options.cacheResults===false)
-				continue;
-			this.store(op.results);
+		if (v===undefined) {
+			this.set(k,v);
+			delete this[k];
+		} else {
+			this.set(k,v);
 		}
 		this.endPropertyChanges();
 	},

data/app/controllers/{kojac_controller.rb → kojac_base_controller.rb}

@@ -1,16 +1,20 @@
-class KojacController < ApplicationController
+class KojacBaseController < ApplicationController
 
 	respond_to :json
 	protect_from_forgery :only => []
 
 	protected
 
+	def kojac_current_user
+		current_user
+	end
+
 	def controller_for_key(aKey)
 		resource = aKey.split('__').first
 		controller_name = resource.camelize+'Controller'
 		if controller = controller_name.constantize
 			result = controller.new
-			result.current_user = self.current_user
+			result.current_user = self.kojac_current_user
 			result
 		else
 			nil
@@ -46,25 +50,28 @@ class KojacController < ApplicationController
     begin
       input = params[:kojac]
       output = process_ops(input)
-			status = :ok
     rescue => e
 			raise e unless Rails.env.production?
 			Rails.logger.debug e.message
 			Rails.logger.debug e.backtrace.join("\n")
+			handle_exception(e) if respond_to? :handle_exception
 	    output = {
-		    results: nil,
-	      errors: [{
-		      message: e.message,
-	        backtrace: e.backtrace
-	      }]
+		    error: {
+			    format: 'KojacError',
+			    kind: 'Exception',
+		      errors: [{
+			      message: e.message,
+		        backtrace: e.backtrace
+		      }]
+		    }
 	    }
-			status = :unprocessable_entity
     end
+		status = output[:error] ? :unprocessable_entity : :ok
     #output = ActiveModel::Serializer.new(output,current_user).to_json
     #sz = output.active_model_serializer.new(output)
     #jsons = sz.to_json(:scope => current_user, :root => false)
-    jsons = app_serialize(output,current_user)
-    render json: jsons, status: status
+    jsono = KojacUtils.to_jsono(output,scope: kojac_current_user)
+    render json: jsono, status: status
 	end
 
 end