alchemymvc 1.2.8 → 1.3.1

package/lib/class/schema_client.js

@@ -79,6 +79,12 @@ Schema.setStatic(function unDry(value, custom_method, whenDone) {
 Schema.setDeprecatedProperty('modelName',     'model_name');
 Schema.setDeprecatedProperty('modelClass',    'model_class');
 Schema.setDeprecatedProperty('modelInstance', 'model_instance');
+Schema.setDeprecatedProperty('hasTranslations', 'has_translations');
+Schema.setDeprecatedProperty('hasAlternates', 'has_alternates');
+Schema.setDeprecatedProperty('translatableFields', 'translatable_fields');
+Schema.setDeprecatedProperty('indexFields', 'index_fields');
+Schema.setDeprecatedProperty('enumValues', 'enum_values');
+Schema.setDeprecatedProperty('hasBehaviours', 'has_behaviours');
 
 /**
  * Set a reference to itself
@@ -128,17 +134,34 @@ Schema.setProperty(function field_count() {
 	return result;
 });
 
+/**
+ * Does this schema have translatable fields?
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @type     {Boolean}
+ */
+Schema.setProperty(function has_translatable_fields() {
+	return this.has_translations;
+});
+
 /**
  * Clone for JSON-Dry (JSON.clone())
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.3.1
  *
  * @return   {Object}
  */
-Schema.setMethod(function dryClone() {
-	return this.clone();
+Schema.setMethod(function dryClone(wm, custom_method) {
+
+	let obj = JSON.toDryObject(this),
+	    cloned = JSON.undry(obj);
+
+	return cloned;
 });
 
 /**
@@ -147,16 +170,12 @@ Schema.setMethod(function dryClone() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.3.1
  *
  * @return   {Object}
  */
 Schema.setMethod(function clone() {
-
-	let obj = JSON.toDryObject(this),
-	    cloned = JSON.undry(obj);
-
-	return cloned;
+	return this.dryClone();
 });
 
 /**
@@ -164,21 +183,31 @@ Schema.setMethod(function clone() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.1
  *
  * @return   {Object}
  */
 Schema.setMethod(function toDry() {
 
-	var value = {
+	const value = {
 		name         : this.name,
 		associations : this.associations,
 		fields       : [],
-		rules        : this.rules,
+		rules        : new Deck(),
 	};
 
-	if (this.parent) {
-		value.parent = this.parent;
+	let rule_dict = this.rules.getDict();
+
+	// Only add rules that are manually added to the schema,
+	// not ones defined by the field (else we would revive the rules double)
+	for (let key in rule_dict) {
+		let entry = rule_dict[key];
+
+		if (entry.options?.from_field) {
+			continue;
+		}
+
+		value.rules.set(key, entry);
 	}
 
 	if (this.model_name) {
@@ -191,24 +220,25 @@ Schema.setMethod(function toDry() {
 
 	value.options = this.options;
 
+	let result = {value};
+
 	// Get the sorted fields
-	let options,
-	    fields = this.getSorted(false),
+	let fields = this.getSorted(false),
 	    field,
 	    i;
-
+	
 	for (i = 0; i < fields.length; i++) {
 		field = fields[i];
 
 		value.fields.push({
 			name       : field.name,
-			options    : field.options,
+			options    : field.getOptionsForDrying(),
 			class_name : field.constructor.name,
 			namespace  : field.constructor.namespace,
 		});
 	}
 
-	return {value: value};
+	return result;
 });
 
 /**
@@ -216,7 +246,7 @@ Schema.setMethod(function toDry() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.0
  */
 Schema.setMethod(function init() {
 	this.associations = {};
@@ -225,19 +255,19 @@ Schema.setMethod(function init() {
 	this.indexes = {};
 
 	// All fields belonging to an index group
-	this.indexFields = {};
+	this.index_fields = {};
 
 	// All translatable fields
-	this.translatableFields = {};
+	this.translatable_fields = {};
 
 	// Amount of translatable fields
-	this.hasTranslations = 0;
+	this.has_translations = 0;
 
 	// Amount of alternate indexes
-	this.hasAlternates = 0;
+	this.has_alternates = 0;
 
 	// Enum values
-	this.enumValues = {};
+	this.enum_values = {};
 
 	// Attached behaviours
 	this.behaviours = {};
@@ -249,7 +279,7 @@ Schema.setMethod(function init() {
 	this.rules = new Deck();
 
 	// Behaviour count
-	this.hasBehaviours = 0;
+	this.has_behaviours = 0;
 });
 
 /**
@@ -448,9 +478,9 @@ Schema.setMethod(function getPrivateFields() {
 /**
  * Add a field to this schema
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.7
+ * @version  1.3.0
  *
  * @param    {String}   name
  * @param    {String}   type
@@ -510,8 +540,8 @@ Schema.setMethod(function addField(name, type, options) {
 	field = new FieldClass(this, name, options);
 
 	if (field.requires_translating) {
-		this.hasTranslations++;
-		this.translatableFields[name] = field;
+		this.has_translations++;
+		this.translatable_fields[name] = field;
 	}
 
 	this.set(name, field);
@@ -521,12 +551,12 @@ Schema.setMethod(function addField(name, type, options) {
 		    i;
 
 		for (i = 0; i < rules.length; i++) {
-			this.addRule(rules[i], [name]);
+			this.addRule(rules[i], {from_field: true, fields: [name]});
 		}
 	}
 
 	if (options.required) {
-		this.addRule('not_empty', [name]);
+		this.addRule('not_empty', {from_field: true, fields: [name]});
 	}
 
 	return field;
@@ -706,7 +736,7 @@ Schema.setMethod(function getFieldNames() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {String|FieldType}   _field
  * @param    {Object}             options
@@ -772,7 +802,7 @@ Schema.setMethod(function addIndex(_field, _options) {
 	// it needs the 'alternate' property in order to be used
 	// as an alternate method of updating without _id
 	if (options.alternate) {
-		this.hasAlternates++;
+		this.has_alternates++;
 	}
 
 	that.getDatasource().done(function gotDs(err, datasource) {
@@ -799,7 +829,7 @@ Schema.setMethod(function addIndex(_field, _options) {
 
 		// Store the field order in the index groups
 		that.indexes[options.name].fields[path] = options.order;
-		that.indexFields[path] = options;
+		that.index_fields[path] = options;
 
 		datasource.ensureIndex(that.model_class, that.indexes[options.name], function ensuredIndex(err, result) {
 

package/lib/class/session.js

@@ -5,7 +5,7 @@ var data_listeners = alchemy.shared('data_binding_listeners');
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.1
  *
  * @param    {Conduit}   conduit   The initializing conduit
  */
@@ -36,10 +36,19 @@ var Session = Function.inherits('Alchemy.Base', function ClientSession(conduit)
 	this.data_listener_ids = {};
 
 	// Postponed requests
-	this.postponed = new Classes.Develry.Cache();
+	this.postponements = new Classes.Develry.Cache();
+
+	// Postponed requests are invalidated after 3 hours
+	this.postponements.max_age = 3 * 60 * 60 * 1000;
+
+	// Time spent in the queue
+	this.queued_time = 0;
 
-	// Postponed requests are invalidated after 1 hour
-	this.postponed.max_age = 60 * 60 * 1000;
+	// Any postponements that have happened already
+	this.postponement_counter = 0;
+
+	// The amount of renders that have happened during this session
+	this.render_counter = 0;
 
 	// Increment the alchemy session count
 	alchemy.session_count++;
@@ -103,6 +112,56 @@ Session.setProperty(function idle_time() {
 	return result;
 });
 
+/**
+ * Is this an active session?
+ * When no activity happens for 5 minutes, the session becomes inactive.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @type     {Boolean}
+ */
+Session.setProperty(function is_active() {
+
+	if (this.idle_time < 5 * 60 * 1000) {
+		return true;
+	}
+
+	return false;
+});
+
+/**
+ * Add the amount of time this client has been in the queue
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Boolean}
+ */
+Session.setMethod(function addFinishedQueueDuration(ms) {
+	this.queued_time += ms;
+});
+
+/**
+ * Has this client already been in the queue?
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Boolean}
+ */
+Session.setMethod(function hasAlreadyQueued() {
+
+	if (this.queued_time > 0) {
+		return true;
+	}
+
+	return false;
+});
+
 /**
  * Register a conduit
  *
@@ -134,21 +193,84 @@ Session.setMethod(function createMenuItem(conduit) {
 /**
  * Postpone the result
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.3.1
  *
  * @param    {Conduit}   conduit   The conduit to postpone
+ * @param    {Object}    options
  *
- * @return   {String}    The postponed id
+ * @return   {Alchemy.Conduit.Postponement}    The postponement
+ */
+Session.setMethod(function postpone(conduit, options) {
+
+	let id = Crypto.uid();
+
+	let postponement = new Classes.Alchemy.Conduit.Postponement(conduit, id, options);
+
+	this.postponements.set(id, postponement);
+
+	this.postponement_counter++;
+
+	return postponement;
+});
+
+/**
+ * Increment the render count
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Number}    The amount of renders
  */
-Session.setMethod(function postpone(conduit) {
+Session.setMethod(function incrementRenderCount() {
+	return ++this.render_counter;
+});
 
-	var key = Crypto.uid();
+/**
+ * Get a postponement by its id
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @param    {String}   id   The postponement id
+ *
+ * @return   {Alchemy.Conduit.Postponement}    The postponement
+ */
+Session.setMethod(function getPostponement(id) {
+	return this.postponements.get(id);
+});
 
-	this.postponed.set(key, conduit);
+/**
+ * See if a postponement already exists for the given conduit
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @param    {Conduit}   conduit
+ *
+ * @return   {Alchemy.Conduit.Postponement}    The postponement
+ */
+Session.setMethod(function getExistingPostponement(conduit) {
+
+	if (!this.postponement_counter) {
+		return;
+	}
+
+	if (!this.postponements.length) {
+		return;
+	}
 
-	return key;
+	let postponement;
+
+	for (postponement of this.postponements) {
+		if (postponement.original_path === conduit.path) {
+			return postponement;
+		}
+	}
 });
 
 /**
@@ -156,7 +278,7 @@ Session.setMethod(function postpone(conduit) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.1
  *
  * @param    {Boolean}   expired   True if removed because time ran out
  */
@@ -180,6 +302,10 @@ Session.setMethod(function removed(expired) {
 		this.menu_item.remove();
 	}
 
+	for (let postponement of this.postponements) {
+		postponement.expire();
+	}
+
 	this.emit('removed', expired);
 });