Refactor sandbox to assimilate and remove collection

lib/sinon.js

@@ -1,15 +1,16 @@
 "use strict";
 
 exports.assert = require("./sinon/assert");
-exports.collection = require("./sinon/collection");
 exports.match = require("./sinon/match");
 exports.spy = require("./sinon/spy");
 exports.spyCall = require("./sinon/call");
 exports.stub = require("./sinon/stub");
 exports.mock = require("./sinon/mock");
 
-var sandbox = require("./sinon/sandbox");
-exports.sandbox = sandbox;
+var Sandbox = require("./sinon/sandbox");
+exports.sandbox = new Sandbox();
+exports.createSandbox = require("./sinon/create-sandbox");
+
 exports.expectation = require("./sinon/mock-expectation");
 exports.createStubInstance = require("./sinon/stub").createStubInstance;
 
@@ -28,7 +29,6 @@ exports.useFakeXMLHttpRequest = nise.fakeXhr.useFakeXMLHttpRequest;
 exports.fakeServer = nise.fakeServer;
 exports.fakeServerWithClock = nise.fakeServerWithClock;
 
-exports.createSandbox = sandbox.create;
 exports.createFakeServer = nise.fakeServer.create.bind(nise.fakeServer);
 exports.createFakeServerWithClock = nise.fakeServerWithClock.create.bind(nise.fakeServerWithClock);
 

lib/sinon/create-sandbox.js

@@ -0,0 +1,64 @@
+"use strict";
+
+var Sandbox = require("./sandbox");
+var push = [].push;
+
+function prepareSandboxFromConfig(config) {
+    var sandbox = new Sandbox();
+
+    if (config.useFakeServer) {
+        if (typeof config.useFakeServer === "object") {
+            sandbox.serverPrototype = config.useFakeServer;
+        }
+
+        sandbox.useFakeServer();
+    }
+
+    if (config.useFakeTimers) {
+        if (typeof config.useFakeTimers === "object") {
+            sandbox.useFakeTimers.call(sandbox, config.useFakeTimers);
+        } else {
+            sandbox.useFakeTimers();
+        }
+    }
+
+    return sandbox;
+}
+
+function exposeValue(sandbox, config, key, value) {
+    if (!value) {
+        return;
+    }
+
+    if (config.injectInto && !(key in config.injectInto)) {
+        config.injectInto[key] = value;
+        sandbox.injectedKeys.push(key);
+    } else {
+        push.call(sandbox.args, value);
+    }
+}
+
+function createSandbox(config) {
+    if (!config) {
+        return new Sandbox();
+    }
+
+    var configuredSandbox = prepareSandboxFromConfig(config);
+    configuredSandbox.args = configuredSandbox.args || [];
+    configuredSandbox.injectedKeys = [];
+    configuredSandbox.injectInto = config.injectInto;
+    var exposed = configuredSandbox.inject({});
+
+    if (config.properties) {
+        config.properties.forEach(function (prop) {
+            var value = exposed[prop] || prop === "sandbox" && configuredSandbox;
+            exposeValue(configuredSandbox, config, prop, value);
+        });
+    } else {
+        exposeValue(configuredSandbox, config, "sandbox");
+    }
+
+    return configuredSandbox;
+}
+
+module.exports = createSandbox;