Merge pull request #215 from avoidwork/edge

API change
avoidwork · Feb 23, 2013 · f1803b5 · f1803b5
2 parents dfa356e + 86a2300
commit f1803b5
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 14 deletions.
diff --git a/lib/abaaso.js b/lib/abaaso.js
@@ -6,7 +6,7 @@
  * @license BSD-3 <https://raw.github.com/avoidwork/abaaso/master/LICENSE>
  * @link http://abaaso.com
  * @module abaaso
- * @version 3.4.26
+ * @version 3.4.27
  */
 
 (function (global) {
@@ -2532,6 +2532,30 @@ var data = {
 			return this.storage(arg || this, "set");
 		},
 
+		/**
+		 * Selects records based on an explcit description
+		 * 
+		 * @param  {Object} where  Object describing the WHERE clause
+		 * @return {Array}         Array of records
+		 */
+		select : function (where) {
+			var result;
+
+			if (!(where instanceof Object)) throw Error(label.error.invalidArguments);
+
+			result = this.get().filter(function (rec) {
+				var match = true;
+
+				utility.iterate(where, function (v, k) {
+					if (rec.data[k] !== v) return (match = false);
+				});
+
+				return match;
+			});
+
+			return result;
+		},
+
 		/**
 		 * Creates or updates an existing record
 		 *
@@ -2785,9 +2809,10 @@ var data = {
 		 * @param  {String} query       SQL (style) order by
 		 * @param  {String} create      [Optional, default behavior is true, value is false] Boolean determines whether to recreate a view if it exists
 		 * @param  {String} sensitivity [Optional] Sort sensitivity, defaults to "ci" (insensitive = "ci", sensitive = "cs", mixed = "ms")
-		 * @return {Array}               View of data
+		 * @param  {Object} where       Object describing the WHERE clause
+		 * @return {Array}              View of data
 		 */
-		sort : function (query, create, sensitivity) {
+		sort : function (query, create, sensitivity, where) {
 			if (query === undefined || String(query).isEmpty()) throw Error(label.error.invalidArguments);
 			if (!regex.sensitivity_types.test(sensitivity)) sensitivity = "ci";
 
@@ -2886,7 +2911,7 @@ var data = {
 				return sorted;
 			};
 
-			result           = crawl(queries, this.records);
+			result           = crawl(queries, where === undefined ? this.records : this.select(where));
 			this.views[view] = result;
 			return result;
 		},
@@ -3333,7 +3358,8 @@ var datalist = {
 			};
 
 			// Consuming records based on sort
-			consumed = this.order.isEmpty() ? this.store.get() : this.store.sort(this.order, false, this.sensitivity);
+			if (this.where === null) consumed = this.order.isEmpty() ? this.store.get() : this.store.sort(this.order, false, this.sensitivity);
+			else consumed = this.order.isEmpty() ? this.store.select(this.where) : this.store.sort(this.order, false, this.sensitivity, this.where);
 
 			// Processing (filtering) records & generating templates
 			array.each(consumed, function (i) {
@@ -3526,6 +3552,7 @@ function DataList (element, store, template) {
 	this.total       = 0;
 	this.sensitivity = "ci";
 	this.store       = store;
+	this.where       = null;
 };
 
 // Setting prototype & constructor loop
@@ -6940,7 +6967,7 @@ var xhr = function () {
 	    XMLHttpRequest, headers, handler, handlerError, state;
 
 	headers = {
-		"User-Agent"   : "abaaso/3.4.26 node.js/" + process.versions.node.replace(/^v/, "") + " (" + string.capitalize(process.platform) + " V8/" + process.versions.v8 + ")",
+		"User-Agent"   : "abaaso/3.4.27 node.js/" + process.versions.node.replace(/^v/, "") + " (" + string.capitalize(process.platform) + " V8/" + process.versions.v8 + ")",
 		"Content-Type" : "text/plain",
 		"Accept"       : "*/*"
 	};
@@ -7871,7 +7898,7 @@ return {
 	update          : element.update,
 	uuid            : utility.uuid,
 	validate        : validate.test,
-	version         : "3.4.26",
+	version         : "3.4.27",
 	walk            : utility.walk
 };
 

diff --git a/lib/abaaso.min.js b/lib/abaaso.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "abaaso",
   "description": "abaaso is a modern, lightweight Enterprise class RESTful JavaScript application framework.",
-  "version": "3.4.26",
+  "version": "3.4.27",
   "homepage": "http://abaaso.com",
   "author": {
     "name": "Jason Mulligan",

diff --git a/src/data.js b/src/data.js
@@ -838,6 +838,30 @@ var data = {
 			return this.storage(arg || this, "set");
 		},
 
+		/**
+		 * Selects records based on an explcit description
+		 * 
+		 * @param  {Object} where  Object describing the WHERE clause
+		 * @return {Array}         Array of records
+		 */
+		select : function (where) {
+			var result;
+
+			if (!(where instanceof Object)) throw Error(label.error.invalidArguments);
+
+			result = this.get().filter(function (rec) {
+				var match = true;
+
+				utility.iterate(where, function (v, k) {
+					if (rec.data[k] !== v) return (match = false);
+				});
+
+				return match;
+			});
+
+			return result;
+		},
+
 		/**
 		 * Creates or updates an existing record
 		 *
@@ -1091,9 +1115,10 @@ var data = {
 		 * @param  {String} query       SQL (style) order by
 		 * @param  {String} create      [Optional, default behavior is true, value is false] Boolean determines whether to recreate a view if it exists
 		 * @param  {String} sensitivity [Optional] Sort sensitivity, defaults to "ci" (insensitive = "ci", sensitive = "cs", mixed = "ms")
-		 * @return {Array}               View of data
+		 * @param  {Object} where       Object describing the WHERE clause
+		 * @return {Array}              View of data
 		 */
-		sort : function (query, create, sensitivity) {
+		sort : function (query, create, sensitivity, where) {
 			if (query === undefined || String(query).isEmpty()) throw Error(label.error.invalidArguments);
 			if (!regex.sensitivity_types.test(sensitivity)) sensitivity = "ci";
 
@@ -1192,7 +1217,7 @@ var data = {
 				return sorted;
 			};
 
-			result           = crawl(queries, this.records);
+			result           = crawl(queries, where === undefined ? this.records : this.select(where));
 			this.views[view] = result;
 			return result;
 		},

diff --git a/src/datalist.js b/src/datalist.js
@@ -239,7 +239,8 @@ var datalist = {
 			};
 
 			// Consuming records based on sort
-			consumed = this.order.isEmpty() ? this.store.get() : this.store.sort(this.order, false, this.sensitivity);
+			if (this.where === null) consumed = this.order.isEmpty() ? this.store.get() : this.store.sort(this.order, false, this.sensitivity);
+			else consumed = this.order.isEmpty() ? this.store.select(this.where) : this.store.sort(this.order, false, this.sensitivity, this.where);
 
 			// Processing (filtering) records & generating templates
 			array.each(consumed, function (i) {
@@ -432,6 +433,7 @@ function DataList (element, store, template) {
 	this.total       = 0;
 	this.sensitivity = "ci";
 	this.store       = store;
+	this.where       = null;
 };
 
 // Setting prototype & constructor loop