namespaced all variables within the __set__ method so you can really set all variables

jhnns · jhnns · commit 512548d888a8 · 2012-06-15T15:48:01.000+02:00
diff --git a/lib/__get__.js b/lib/__get__.js
@@ -9,7 +9,7 @@
  * @return {*}
  */
 module.exports = function __get__(name) {
-    if (typeof name !== "string" || name == false) {
+    if (typeof name !== "string" || name.length === 0) {
         throw new TypeError("__get__ expects a non-empty string");
     }
 
diff --git a/lib/__set__.js b/lib/__set__.js
@@ -4,38 +4,40 @@
  * This function will be stringified and then injected into every rewired module.
  * Then you can set private variables by calling myModule.__set__("myPrivateVar", newValue);
  *
+ * All variables within this function are namespaced in the arguments array because every
+ * var declaration could possibly clash with a variable in the module scope.
+ *
  * @param {!String|!Object} varName name of the variable to set
  * @param {String} varValue new value
  * @throws {TypeError}
  * @return {*}
  */
-module.exports = function __set__(varName, varValue) {
-    var key,
-        env,
-        src = "";
-
-    function checkExistsSrc(varName) {
+module.exports = function __set__() {
+    arguments.varName = arguments[0];
+    arguments.varValue = arguments[1];
+    arguments.src = "";
+    arguments.checkExistsSrc = function (varName) {
         return "if (typeof " + varName + " === 'undefined') { throw new ReferenceError('" + varName + " is not defined');} ";
-    }
+    };
 
-    if (typeof varName === "object") {
-        env = varName;
-        if (!env || Array.isArray(env)) {
+    if (typeof arguments[0] === "object") {
+        arguments.env = arguments.varName;
+        if (!arguments.env || Array.isArray(arguments.env)) {
             throw new TypeError("__set__ expects an object as env");
         }
-        for (key in env) {
-            if (env.hasOwnProperty(key)) {
-                src += checkExistsSrc(key) + key + " = env." + key + ";";
+        for (arguments.key in arguments.env) {
+            if (arguments.env.hasOwnProperty(arguments.key)) {
+                arguments.src += arguments.checkExistsSrc(arguments.key) + arguments.key + " = arguments.env." + arguments.key + ";";
             }
         }
-    } else if (typeof varName === "string") {
-        if (!varName) {
+    } else if (typeof arguments.varName === "string") {
+        if (!arguments.varName) {
             throw new TypeError("__set__ expects a non-empty string as a variable name");
         }
-        src = checkExistsSrc(varName) + varName + " = varValue;"
+        arguments.src = arguments.checkExistsSrc(arguments.varName) + arguments.varName + " = arguments.varValue;";
     } else {
         throw new TypeError("__set__ expects an environment object or a non-empty string as a variable name");
     }
 
-    eval(src);
+    eval(arguments.src);
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name" : "rewire",
-    "version" : "0.2.0",
+    "version" : "0.2.1",
     "description" : "Dependency injection for node.js applications",
     "keywords" : [
         "dependency",
@@ -27,7 +27,7 @@
         "url": "git://github.com/jhnns/rewire.git"
     },
     "engines" : {
-        "node" : "0.6.x"
+        "node" : "0.8.x"
     },
     "devDependencies": {
         "mocha": "1.1.x",
diff --git a/test/__set__.test.js b/test/__set__.test.js
@@ -19,7 +19,14 @@ describe("__set__", function () {
     beforeEach(function () {
         moduleFake = {
             myNumber: 0,    // copy by value
-            myObj: {}       // copy by reference
+            myObj: {},       // copy by reference
+
+            // these variables are used within the set method
+            // because there is a eval() statement within the set method
+            // these variables should not override same-named vars of the module
+            key: "key",
+            env: "env",
+            src: "src"
         };
 
         vm.runInNewContext(
@@ -66,6 +73,9 @@ describe("__set__", function () {
                 notExistingAsWell: "blabla"
             });
         }).to.throwException(expectReferenceError);
+    });
+    it("should not clash with vars used within the set method", function () {
+
     });
     it("should throw a TypeError when passing misfitting params", function () {
         expect(function () {
diff --git a/test/rewire.test.js b/test/rewire.test.js
@@ -63,6 +63,7 @@ describe("rewire", function () {
         expect(rewiredModuleA.getMyNumber()).to.be(2);
         rewiredModuleA.__set__("myObj", newObj);
         expect(rewiredModuleA.getMyObj()).to.be(newObj);
+        rewiredModuleA.__set__("env", "ENVENV");
     });
     it("should provide the ability to get private vars", function () {
         var rewiredModuleA = rewire(testModules.A);
diff --git a/test/testModules/moduleA.js b/test/testModules/moduleA.js
@@ -3,6 +3,7 @@
 var someOtherModule = require("./someOtherModule.js"),
     myNumber = 0,   // copy by value
     myObj = {},     // copy by reference
+    env = "bla",
     fs = require("fs");
 
 // We need getters and setters for private vars to check if our injected setters and getters actual work

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* @return {*}`
`10`	`10`	`*/`
`11`	`11`	`module.exports = function __get__(name) {`
`12`		`- if (typeof name !== "string" \|\| name == false) {`
	`12`	`+ if (typeof name !== "string" \|\| name.length === 0) {`
`13`	`13`	`throw new TypeError("__get__ expects a non-empty string");`
`14`	`14`	`}`
`15`	`15`