Refactor tree so that it will work with the module model. (Not working at all prior)

1 files changed, 47 insertions, 50 deletions

diff --git a/lib/tree.js b/lib/tree.js
index c35851cf..75e2d75f 100644
--- a/lib/tree.js
+++ b/lib/tree.js
@@ -1,67 +1,64 @@
 var Faker = require('../index');
 
-var clone = function clone(obj) {
-    if (obj == null || typeof(obj) != 'object')
-        return obj;
-
-    var temp = obj.constructor(); // changed
+var tree = {
 
-    for (var key in obj) {
-        temp[key] = clone(obj[key]);
-    }
-    return temp;
-};
+    clone: function clone(obj) {
+        if (obj == null || typeof(obj) != 'object')
+            return obj;
 
+        var temp = obj.constructor(); // changed
 
-var createTree = function (depth, width, obj) {
+        for (var key in obj) {
+            temp[key] = this.clone(obj[key]);
+        }
+        return temp;
+    },
 
-    if (!obj) {
-        throw {
-            name: "ObjectError",
-            message: "there needs to be an object passed in",
-            toString: function () {
-                return this.name + ": " + this.message
-            }
-        };
-    }
+    createTree: function (depth, width, obj) {
+        if (!obj) {
+            throw {
+                name: "ObjectError",
+                message: "there needs to be an object passed in",
+                toString: function () {
+                    return this.name + ": " + this.message
+                }
+            };
+        }
 
-    if (width <= 0) {
-        throw {
-            name: "TreeParamError",
-            message: "width must be greater than zero",
-            toString: function () {
-                return this.name + ": " + this.message
-            }
-        };
-    }
+        if (width <= 0) {
+            throw {
+                name: "TreeParamError",
+                message: "width must be greater than zero",
+                toString: function () {
+                    return this.name + ": " + this.message
+                }
+            };
+        }
 
-    var newObj = clone(obj);
+        var newObj = this.clone(obj);
 
-    for (var prop in newObj) {
-        if (newObj.hasOwnProperty(prop)) {
-            var value = null;
-            if (newObj[prop] !== "__RECURSE__") {
-                value = eval(newObj[prop]);
-            }
-            else {
-                if (depth !== 0) {
-                    value = [];
-                    for (var i = 0; i < width; i++) {
-                        value.push(createTree(depth - 1, width, obj));
+        for (var prop in newObj) {
+            if (newObj.hasOwnProperty(prop)) {
+                var value = null;
+                if (newObj[prop] !== "__RECURSE__") {
+                    value = eval(newObj[prop]);
+                }
+                else {
+                    if (depth !== 0) {
+                        value = [];
+                        for (var i = 0; i < width; i++) {
+                            value.push(this.createTree(depth - 1, width, obj));
+                        }
                     }
                 }
-            }
 
-            newObj[prop] = value;
+                newObj[prop] = value;
+            }
         }
+
+        return newObj;
     }
 
-    return newObj;
 };
 
-var tree = {
-    createTree: createTree
-};
-
-
-module.exports = tree;
+module.exports = tree;
\ No newline at end of file