Merge 6cf2ce8 into d728b1b

lib/module.js

@@ -38,6 +38,8 @@ var _nativeNames = [
   'url',
 ];
 
+var _extendGlobals = {};
+
 // See: https://github.com/joyent/node/issues/1707#issuecomment-2106309
 function hasOwnProperty(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
@@ -78,6 +80,11 @@ exports.config = function (options) {
       _nativeModules[k] = options.modules[k];
     }
   }
+  if (options.globals) {
+    for (var j in options.globals) {
+      _extendGlobals[j] = options.globals[j];
+    }
+  }
   _enableAddons = options.enableAddons === true;
   _limitRootDir = options.limitRoot || '/';
   // make sure limit root dir end withs '/'
@@ -222,6 +229,10 @@ SandboxModule.prototype._compile = function (content, filename) {
 
   var dirname = path.dirname(filename);
 
+  for (var j in _extendGlobals) {
+    global[j] = _extendGlobals[j];
+  }
+
   SandboxModule._contextLoad = true;
   if (SandboxModule._contextLoad) {
     debug('self._compile() %s', self.id);

test/fixtures/extend_globals.js

@@ -0,0 +1 @@
+foo();

test/module.test.js

@@ -66,6 +66,18 @@ describe('module.test.js', function () {
         mod.load(path.join(fixtures, 'limit_root.js'));
       }).should.throw("Cannot find module '../../lib/module'");
     });
+
+    it('should extend globals works fine', function (done) {
+      sm.config({
+        'globals' : {
+          'foo' : function () {
+            should.ok(true);
+            done();
+          },
+        }
+      });
+      (new Module('.')).load(path.join(fixtures, 'extend_globals.js'));
+    });
   });
 
   describe('securty hook', function () {