test cases up

Bradley Meck · Bradley Meck · commit 59f409754f7c · 2010-07-28T11:32:38.000-05:00
diff --git a/lib/proxy.js b/lib/proxy.js
@@ -1,20 +1,20 @@
 var Overload=require("overload");
 var Watchable=Overload.Watchable;
 var RePrototype=Overload.RePrototype;
-var Proxy = {
+module.exports = {
 	create: function(handler,prototype) {
 		var proxy=Watchable(
 			//get
-			function(context) {
-				return handler["get"].call(context.thisObject,context.holder,context.property)
+			function(ArgInfo) {
+				return handler["get"].call(ArgInfo.thisObject,ArgInfo.holder,ArgInfo.property)
 			}
 			//set
 			,function(context) {
 				return handler["set"].call(context.thisObject,context.holder,context.property,context.value)
 			}
 			//enum
 			,function(context) {
-				return handler["enumerate"]();
+				return handler["enumerate"].call(context.thisObject);
 			}
 			//query
 			,function(context) {
diff --git a/lib/util.js b/lib/util.js
@@ -2,7 +2,7 @@ var overload=require("./overload")
 , Watchable = overload.Watchable
 , RePrototype = overload.RePrototype
 
-exports.ReadOnly=ReadOnly=function(obj,mask) {
+exports.ReadOnly=ReadOnly=function(obj,mask,filter) {
 	var $this=Watchable(function(args){
 		var v=mask
 		&& args.property in mask
@@ -12,7 +12,12 @@ exports.ReadOnly=ReadOnly=function(obj,mask) {
 			return function(){return v.apply(obj,arguments)}
 		}
 		return v;
-	});
+	},filter?function(ArgInfo){
+		var property = ArgInfo.property
+		if(filter(property)) {
+			obj[property] = ArgInfo.value
+		}
+	}:undefined);
 	//only objects have prototypes
 	if(obj instanceof Object) {
 		RePrototype($this,Object.getPrototypeOf(obj))
@@ -29,6 +34,9 @@ ReadOnly.ArrayMask={
 	,splice:function(){return [];}
 	,unshift:function(){return this.length}
 }
+ReadOnly.ArrayFilter = function(property) {
+	return typeof property !== "number"
+}
 ReadOnly.DateMask={
 	setDate:noop
 	,setFullYear:noop
diff --git a/package.json b/package.json
@@ -3,7 +3,8 @@
 , "version" : "1.2.3"
 , "author": "bradleymeck"
 , "main": "lib/overload.node"
-, "scripts": {
-  "install" : "make"
+, "scripts":
+  {  "install" : "make"
+  ,  "test" : "test/all.js"
   }
 }
diff --git a/src/watchable.cc b/src/watchable.cc
@@ -8,8 +8,6 @@
 //		var debug = Watchable(function(p,v){if(typeof v == "number") return v; sys.puts(p);return v;})
 
 #include <v8.h>
-#include <map>
-#include <iostream>
 
 using namespace std;
 using namespace v8;
@@ -93,15 +91,10 @@ Handle<Array> WatchableNamedPropertyEnumerator(
 	Handle<Function> callback = Handle<Function>::Cast(data);
 	Handle<Value> new_value = callback->Call(info.This(),1,values);
 	//Return value is the return of the function call
-	printf("test\n");
-
 	if(new_value->IsArray()) {
-		printf("ok?\n");
 		return scope.Close(Handle<Array>::Cast(new_value));
 	}
 	else {
-		printf("wtf\n");
-		ThrowException(Exception::Error(String::New("Callback must return an Array.")));
 		return scope.Close(Array::New());
 	}
 }
@@ -197,7 +190,6 @@ Handle<Value> WatchableIndexedPropertySetter(
 	//Default
 	Handle<Value> data = callbacks->GetInternalField(1);
 	if(data->IsNull()) {
-		printf("defaulted setter");
 		return scope.Close(Undefined());
 	}
 	//Set up arguments
@@ -236,7 +228,6 @@ Handle<Array> WatchableIndexedPropertyEnumerator(
 		return scope.Close(Handle<Array>::Cast(new_value));
 	}
 	else {
-		ThrowException(String::New("Callback must return an Array."));
 		return scope.Close(Array::New());
 	}
 }
diff --git a/test/all.js b/test/all.js
@@ -0,0 +1,6 @@
+require("./oncollect")
+require("./watchable")
+require("./proxy")
+require("./readonly")
+console.log("ALL PASSED")
+process.exit(0)
diff --git a/test/compilable.js b/test/compilable.js
diff --git a/test/compilable_data.jsc b/test/compilable_data.jsc
diff --git a/test/compile.js b/test/compile.js
diff --git a/test/oncollect.js b/test/oncollect.js
@@ -0,0 +1,19 @@
+var assert = require("assert")
+var OnCollect = require("../lib/overload").OnCollect;
+var b = {}
+  , c = {}
+  , waiting = true
+b.a = c
+
+OnCollect(b,function(obj) {
+	assert.equal(obj.a,c,"revival object validation")
+	waiting = false
+} )
+
+b = null
+assert.equal(b,null,"removal")
+
+setTimeout(
+  function wait(){if(waiting)setTimeout(wait,1000)}
+  ,1000
+)
diff --git a/test/proxy.js b/test/proxy.js
@@ -1,58 +1,60 @@
-var Watchable = require("../lib/overload").Watchable
+var Proxy = require("../lib/proxy")
   , sys = require("sys")
-var proxied={hello:""}
-var debug = Watchable(
-	//GETTER
-	function(ArgInfo){
-		//check the type of the object contained by value
-		//undefined if no value, or number if using []'s with a number
-		var property=ArgInfo.property
-		sys.puts("GET:"+JSON.stringify(property),"VALUE:"+String(proxied[property]));
-		return proxied[property];
-	}
-	//SETTER
-	, function(ArgInfo) {
-		var property=ArgInfo.property
-		var value=ArgInfo.value
-		sys.puts("GET:"+JSON.stringify(property),"VALUE:"+String(proxied[property]),"NEW VALUE:"+String(value));
-		return ArgInfo.value;
-	}
-)
-debug.hello
-debug[" world!"]=true
-
+  , assert = require("assert")
 var x={A:1,B:2},y={B:"B",C:"C"}
 var proto_chain = [x,y];
-var multi_proto = Watchable(
+var multi_proto = Proxy.create({
 	//GETTER
-	function(ArgInfo){
-		//check the type of the object contained by value
-		//undefined if no value, or number if using []'s with a number
-		var property=ArgInfo.property
-		for(var i=proto_chain.length;i>=0;i--) {
+	"get": function(holder,property){
+		for(var i=proto_chain.length-1;i>=0;i--) {
 			var proto = proto_chain[i]
 			if(property in proto) {
 				return proto[property]
 			}
 		}
-		return undefined
+		return null
 	}
 	//SETTER
-	, function(ArgInfo) {
+	, "set": function(holder,property,value) {
 		//DONT SET THE CHAINS VALUES!
 	}
-	, function(ArgInfo) {
-
+	//FOREACH
+	, "enumerate": function() {
+		var properties={}
+		for(var i=proto_chain.length-1;i>=0;i--) {
+			var proto = proto_chain[i]
+			var keys = Object.getOwnPropertyNames(proto)
+			keys = keys.filter(function(item){
+				return !(item in properties)
+			})
+			keys.forEach(function(item){
+				properties[item]=proto[item]
+			})
+		}
+		return Object.getOwnPropertyNames(properties)
+	}
+	, "has": function(property) {
+		return proto_chain.some(function(item){
+			return property in item
+		} )
+	}
+	, "delete": function(ArgInfo) {
 	}
-	, function(ArgInfo) {
-		var property=ArgInfo.property
-		return proto_chain.some(function(item){return property in item})
+	//No DELETER
 	}
 )
-
-var z = function(){};
-z.prototype = multi_proto
-z = new z;
-console.log(z.A);
-console.log(z.B);
-console.log(z.C);
+var zz = function(){};
+zz.prototype = multi_proto
+var z = new zz;
+assert.equal(z.A,1,"2nd Chain");
+assert.equal(z.B,"B","1st Chain");
+assert.equal(z.C,"C","1st Chain");
+z.A = 2
+delete z.A
+assert.equal(z.A,1,"Setter");
+assert.equal("A" in z,true,"query")
+var hold = []
+for(var i in z) {
+	hold.push(i)
+}
+assert.deepEqual(hold,["A","C","B"],"foreach")
diff --git a/test/readonly.js b/test/readonly.js
@@ -0,0 +1,11 @@
+var ReadOnly = require("../lib/util").ReadOnly
+  , assert = require("assert")
+var a = []
+  , ra = ReadOnly(a,ReadOnly.ArrayMask,ReadOnly.ArrayFilter)
+ra.push(1)
+assert.equal(a.length,0,"push")
+ra[0]=2
+assert.equal(a.length,0,"index")
+assert.equal(a[0],null,"get")
+a[0]=1
+assert.equal(ra.length,1,"index")
diff --git a/test/watchable.js b/test/watchable.js
@@ -0,0 +1,85 @@
+var Watchable = require("../lib/overload").Watchable
+  , sys = require("sys")
+  , assert = require("assert")
+var proxied={hello:""}
+var debug = Watchable(
+	//GETTER
+	function(ArgInfo){
+		//check the type of the object contained by value
+		//undefined if no value, or number if using []'s with a number
+		var property=ArgInfo.property
+		assert.equal(property,"hello","GETTER PROPERTY NAME");
+		//sys.puts("GET:"+JSON.stringify(property),"VALUE:"+String(proxied[property]));
+		return proxied[property];
+	}
+	//SETTER
+	, function(ArgInfo) {
+		var property=ArgInfo.property
+		assert.equal(property," world!","SETTER PROPERTY NAME");
+		var value=ArgInfo.value
+		assert.equal(value,true,"SETTER PROPERTY VALUE");
+		//sys.puts("GET:"+JSON.stringify(property),"VALUE:"+String(proxied[property]),"NEW VALUE:"+String(value));
+		return ArgInfo.value;
+	}
+)
+debug.hello
+debug[" world!"]=true
+
+var x={A:1,B:2},y={B:"B",C:"C"}
+var proto_chain = [x,y];
+var multi_proto = Watchable(
+	//GETTER
+	function(ArgInfo){
+		//check the type of the object contained by value
+		//undefined if no value, or number if using []'s with a number
+		var property=ArgInfo.property
+		for(var i=proto_chain.length-1;i>=0;i--) {
+			var proto = proto_chain[i]
+			if(property in proto) {
+				return proto[property]
+			}
+		}
+		return null
+	}
+	//SETTER
+	, function(ArgInfo) {
+		//DONT SET THE CHAINS VALUES!
+	}
+	//FOREACH
+	, function(ArgInfo) {
+		var properties={}
+		for(var i=proto_chain.length-1;i>=0;i--) {
+			var proto = proto_chain[i]
+			var keys = Object.getOwnPropertyNames(proto)
+			keys = keys.filter(function(item){
+				return !(item in properties)
+			})
+			keys.forEach(function(item){
+				properties[item]=proto[item]
+			})
+		}
+		return Object.getOwnPropertyNames(properties)
+	}
+	, function(ArgInfo) {
+		var property=ArgInfo.property
+		return proto_chain.some(function(item){
+			return property in item
+		} )
+	}
+	//No DELETER
+)
+var zz = function(){};
+zz.prototype = multi_proto
+z = new zz;
+assert.equal(z.A,1,"2nd Chain");
+assert.equal(z.B,"B","1st Chain");
+assert.equal(z.C,"C","1st Chain");
+z.A = 2
+delete z.A
+assert.equal(z.A,1,"Setter");
+assert.ok("A" in z,"query")
+var hold = []
+for(var i in z) {
+	hold.push(i)
+}
+assert.deepEqual(hold,["A","C","B"],"foreach")

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`, "version" : "1.2.3"`
`4`	`4`	`, "author": "bradleymeck"`
`5`	`5`	`, "main": "lib/overload.node"`
`6`		`-, "scripts": {`
`7`		`- "install" : "make"`
	`6`	`+, "scripts":`
	`7`	`+ { "install" : "make"`
	`8`	`+ , "test" : "test/all.js"`
`8`	`9`	`}`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@`
`8`	`8`	`// var debug = Watchable(function(p,v){if(typeof v == "number") return v; sys.puts(p);return v;})`
`9`	`9`
`10`	`10`	`#include <v8.h>`
`11`		`-#include <map>`
`12`		`-#include <iostream>`
`13`	`11`
`14`	`12`	`using namespace std;`
`15`	`13`	`using namespace v8;`
`@@ -93,15 +91,10 @@ Handle<Array> WatchableNamedPropertyEnumerator(`
`93`	`91`	`Handle<Function> callback = Handle<Function>::Cast(data);`
`94`	`92`	`Handle<Value> new_value = callback->Call(info.This(),1,values);`
`95`	`93`	`//Return value is the return of the function call`
`96`		`- printf("test\n");`
`97`		`-`
`98`	`94`	`if(new_value->IsArray()) {`
`99`		`- printf("ok?\n");`
`100`	`95`	`return scope.Close(Handle<Array>::Cast(new_value));`
`101`	`96`	`}`
`102`	`97`	`else {`
`103`		`- printf("wtf\n");`
`104`		`- ThrowException(Exception::Error(String::New("Callback must return an Array.")));`
`105`	`98`	`return scope.Close(Array::New());`
`106`	`99`	`}`
`107`	`100`	`}`
`@@ -197,7 +190,6 @@ Handle<Value> WatchableIndexedPropertySetter(`
`197`	`190`	`//Default`
`198`	`191`	`Handle<Value> data = callbacks->GetInternalField(1);`
`199`	`192`	`if(data->IsNull()) {`
`200`		`- printf("defaulted setter");`
`201`	`193`	`return scope.Close(Undefined());`
`202`	`194`	`}`
`203`	`195`	`//Set up arguments`
`@@ -236,7 +228,6 @@ Handle<Array> WatchableIndexedPropertyEnumerator(`
`236`	`228`	`return scope.Close(Handle<Array>::Cast(new_value));`
`237`	`229`	`}`
`238`	`230`	`else {`
`239`		`- ThrowException(String::New("Callback must return an Array."));`
`240`	`231`	`return scope.Close(Array::New());`
`241`	`232`	`}`
`242`	`233`	`}`