From ae10a483834d2870073b5513badc5b7003bcdade Mon Sep 17 00:00:00 2001
From: Tim-Smart <timehAndGod@gmail.com>
Date: Fri, 12 Mar 2010 21:36:00 +1300
Subject: [PATCH] Initial implementation of process.evalcx

---
 src/node.cc                 | 48 +++++++++++++++++++++++++++++++++++++
 test/simple/test-eval-cx.js | 27 +++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 test/simple/test-eval-cx.js

diff --git a/src/node.cc b/src/node.cc
index 25f249fa7b..8cb5e64ed8 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -846,6 +846,53 @@ Handle<Value> DLOpen(const v8::Arguments& args) {
   return Undefined();
 }
 
+// evalcx(code, sandbox={})
+// Executes code in a new context
+Handle<Value> EvalCX(const Arguments& args) {
+  HandleScope scope;
+
+  Local<String> code = args[0]->ToString();
+  Local<Object> sandbox = args.Length() > 1 ? args[1]->ToObject()
+                                            : Object::New();
+  // Create the new context
+  Persistent<Context> context = Context::New();
+
+  // Copy objects from global context, to our brand new context
+  Handle<Array> keys = sandbox->GetPropertyNames();
+
+  int i;
+  for (i = 0; i < keys->Length(); i++) {
+    Handle<String> key = keys->Get(Integer::New(i))->ToString();
+    Handle<Value> value = sandbox->Get(key);
+    context->Global()->Set(key, value->ToObject()->Clone());
+  }
+
+  // Enter and compile script
+  context->Enter();
+
+  // Catch errors
+  TryCatch try_catch;
+
+  Local<Script> script = Script::Compile(code, String::New("evalcx"));
+  Handle<Value> result;
+
+  if (script.IsEmpty()) {
+    result = ThrowException(try_catch.Exception());
+  } else {
+    result = script->Run();
+    if (result.IsEmpty()) {
+      result = ThrowException(try_catch.Exception());
+    }
+  }
+
+  // Clean up, clean up, everybody everywhere!
+  context->DetachGlobal();
+  context->Exit();
+  context.Dispose();
+
+  return scope.Close(result);
+}
+
 Handle<Value> Compile(const Arguments& args) {
   HandleScope scope;
 
@@ -1051,6 +1098,7 @@ static void Load(int argc, char *argv[]) {
   // define various internal methods
   NODE_SET_METHOD(process, "loop", Loop);
   NODE_SET_METHOD(process, "unloop", Unloop);
+  NODE_SET_METHOD(process, "evalcx", EvalCX);
   NODE_SET_METHOD(process, "compile", Compile);
   NODE_SET_METHOD(process, "_byteLength", ByteLength);
   NODE_SET_METHOD(process, "reallyExit", Exit);
diff --git a/test/simple/test-eval-cx.js b/test/simple/test-eval-cx.js
new file mode 100644
index 0000000000..32d5c94436
--- /dev/null
+++ b/test/simple/test-eval-cx.js
@@ -0,0 +1,27 @@
+require("../common");
+
+debug('evalcx a string');
+var result = process.evalcx('"passed";');
+assert.equal('passed', result);
+
+debug('evalcx a thrown error');
+assert.throws(function() {
+  process.evalcx('throw new Error("test");');
+});
+
+hello = 5;
+process.evalcx('hello = 2');
+assert.equal(5, hello);
+
+
+code = "foo = 1; bar = 2;";
+foo = 2;
+obj = { foo : 0 };
+process.evalcx(code, obj);
+
+/* TODO?
+assert.equal(1, obj.foo);
+assert.equal(2, obj.bar);
+*/
+
+assert.equal(2, foo);