deploy1 6 jaren geleden
bovenliggende
commit
a852a3b39a
3 gewijzigde bestanden met toevoegingen van 18 en 23 verwijderingen
  1. 14 13
      index.js
  2. 2 10
      lib/actionsfilters.js
  3. 2 0
      test/tools2.test.js

+ 14 - 13
index.js

@@ -1,20 +1,21 @@
+module.exports = function extend(reciever) {
+    var tool = require("./lib/actionsfilters")();
+    var spfprintf = require("./lib/spfprintf");
 
 
+    var rr = {}; 
 
 
+    if (typeof reciever === "object" || typeof reciever === "function") {
+        rr = reciever;
+    }
 
 
+    for (var p in tool) {
+        rr[p] = tool[p];
+    }
 
 
-module.exports =  function extend(reciever) {
-        var tool = require("./lib/actionsfilters")();
-        var spfprintf = require("./lib/spfprintf");
+    for (var p in spfprintf) {
+        rr[p] = spfprintf[p];
+    }
 
 
-        if (typeof reciever === "object" || typeof reciever === "function") {
-            for(var p in tool){
-                reciever[p] = tool[p];
-            }
 
 
-            for(var p in spfprintf){
-                reciever[p] = spfprintf[p];
-            }
-
-        }
-        return reciever;
+    return rr;
 }
 }

+ 2 - 10
lib/actionsfilters.js

@@ -1,4 +1,4 @@
-function create_tool(){
+module.exports = function create_tool(){
 
 
     var async = require("async");
     var async = require("async");
     var actions = {};
     var actions = {};
@@ -101,12 +101,4 @@ function create_tool(){
 }
 }
 
 
 
 
-module.exports =  function extend(reciever) {
-        var tool = create_tool();
-        if (typeof reciever === "object" || typeof reciever === "function") {
-            for(var p in tool){
-                reciever[p] = tool[p];
-            }
-        }
-        return reciever;
-}
+ 

+ 2 - 0
test/tools2.test.js

@@ -13,6 +13,8 @@
 
 
                 it('Can add an `action` function to be called with do_action', function(done) {
                 it('Can add an `action` function to be called with do_action', function(done) {
                     var tool = tools();
                     var tool = tools();
+                    console.log(tool);
+                    
                     tool.add_action("test", function() {
                     tool.add_action("test", function() {
                         expect(true)
                         expect(true)
                         done();
                         done();