Ticket #243: mochikit_rpartial.patch

MochiKit/Base.js

@@ -598 +598 @@
         };
     },
 
-    /** @id MochiKit.Base.bind */
-    bind: function (func, self/* args... */) {
+    /** @id MochiKit.Base._bind */
+    _bind: function (func, self, preargs, postargs) {
         if (typeof(func) == "string") {
             func = self[func];
         }
         var im_func = func.im_func;
         var im_preargs = func.im_preargs;
+        var im_postargs = func.im_postargs;
         var im_self = func.im_self;
         var m = MochiKit.Base;
         if (typeof(func) == "function" && typeof(func.apply) == "undefined") {
@@ -624 +625 @@
         } else  {
             im_preargs = im_preargs.slice();
         }
-        m.extend(im_preargs, arguments, 2);
+        im_preargs = m.concat(im_preargs, preargs);
+        if (typeof(im_postargs) == 'undefined') {
+            im_postargs = [];
+        } else  {
+            im_postargs = im_postargs.slice();
+        }
+        im_postargs = m.concat(im_postargs, postargs);
         var newfunc = function () {
             var args = arguments;
             var me = arguments.callee;
             if (me.im_preargs.length > 0) {
                 args = m.concat(me.im_preargs, args);
             }
+            if (me.im_postargs.length > 0) {
+                args = m.concat(args, me.im_postargs);
+            }
             var self = me.im_self;
             if (!self) {
                 self = this;
@@ -640 +650 @@
         newfunc.im_self = im_self;
         newfunc.im_func = im_func;
         newfunc.im_preargs = im_preargs;
+        newfunc.im_postargs = im_postargs;
         return newfunc;
     },
-
+        
+        /** @id MochiKit.Base.bind */
+    bind: function (func, self/* args... */) {
+        var m = MochiKit.Base;
+        return m._bind(func, self, m.extend(null,arguments,2), []);
+        },
+        
+        /** @id MochiKit.Base.rbind */
+    rbind: function (func, self/* args... */) {
+        var m = MochiKit.Base;
+        return m._bind(func, self, [], m.extend(null,arguments,2));
+        },
+    
     /** @id MochiKit.Base.bindMethods */
     bindMethods: function (self) {
         var bind = MochiKit.Base.bind;
@@ -941 +964 @@
         return m.bind.apply(this, m.extend([func, undefined], arguments, 1));
     },
 
+    /** @id MochiKit.Base.rpartial */
+    rpartial: function (func) {
+        var m = MochiKit.Base;
+        return m.rbind.apply(this, m.extend([func, undefined], arguments, 1));
+    },
+
     /** @id MochiKit.Base.listMinMax */
     listMinMax: function (which, lst) {
         if (lst.length === 0) {
@@ -1243 +1272 @@
     "methodcaller",
     "compose",
     "bind",
+    "rbind",
     "bindMethods",
     "NotFound",
     "AdapterRegistry",
@@ -1256 +1286 @@
     "keyComparator",
     "reverseKeyComparator",
     "partial",
+    "rpartial",
     "merge",
     "listMinMax",
     "listMax",

MochiKit/DOM.js

@@ -397 +397 @@
     /** @id MochiKit.DOM.getNodeAttribute */
     getNodeAttribute: function (node, attr) {
         var self = MochiKit.DOM;
+                var base = MochiKit.Base;
+                if (base.isArrayLike(node))
+                        return base.map(base.rpartial(self.getNodeAttribute, attr), node);
+        if (base.isArrayLike(attr))
+                        return base.map(base.partial(self.getNodeAttribute, node), attr);
+                node = self.getElement(node);
         var rename = self.attributeArray.renames[attr];
-        node = self.getElement(node);
         try {
             if (rename) {
                 return node[rename];
@@ -413 +418 @@
     /** @id MochiKit.DOM.removeNodeAttribute */
     removeNodeAttribute: function (node, attr) {
         var self = MochiKit.DOM;
+                var base = MochiKit.Base;
+                if (base.isArrayLike(node))
+                        return base.map(base.rpartial(self.removeNodeAttribute, attr), node);
+        if (base.isArrayLike(attr))
+                        return base.map(base.partial(self.removeNodeAttribute, node), attr);
         var rename = self.attributeArray.renames[attr];
         node = self.getElement(node);
         try {
@@ -430 +440 @@
     updateNodeAttributes: function (node, attrs) {
         var elem = node;
         var self = MochiKit.DOM;
+                var base = MochiKit.Base;
+                if (base.isArrayLike(node))
+                        return base.map(base.rpartial(self.updateNodeAttributes, attrs), node);
         if (typeof(node) == 'string') {
             elem = self.getElement(node);
         }
@@ -662 +675 @@
     /** @id MochiKit.DOM.getElement */
     getElement: function (id) {
         var self = MochiKit.DOM;
+                var base = MochiKit.Base;
         if (arguments.length == 1) {
+                        if (base.isArrayLike(id))
+                                return base.map(self.getElement, id);
             return ((typeof(id) == "string") ?
                 self._document.getElementById(id) : id);
         } else {
-            return MochiKit.Base.map(self.getElement, arguments);
+            return base.map(self.getElement, arguments);
         }
     },
 
@@ -764 +780 @@
     /** @id MochiKit.DOM.setElementClass */
     setElementClass: function (element, className) {
         var self = MochiKit.DOM;
+                var base = MochiKit.Base;
+                if (base.isArrayLike(element))
+                        return base.map(base.rpartial(self.setElementClass, className), element);
+        if (base.isArrayLike(className))
+                        return base.map(base.partial(self.setElementClass, element), className);
         var obj = self.getElement(element);
         if (self.attributeArray.compliant) {
             obj.setAttribute("class", className);
@@ -786 +807 @@
     /** @id MochiKit.DOM.addElementClass */
     addElementClass: function (element, className) {
         var self = MochiKit.DOM;
+                var base = MochiKit.Base;
+                if (base.isArrayLike(element))
+                        return base.map(base.rpartial(self.addElementClass, className), element);
+        if (base.isArrayLike(className))
+                        return base.map(base.partial(self.addElementClass, element), className);
         var obj = self.getElement(element);
         var cls = obj.className;
         // trivial case, no className yet

tests/test_Base.js

@@ -113 +113 @@
     t.is( compare([2, 1], [1, 1]), 1, "arrays compare gt (contents)" );
     
     // test partial application
-    var a = [];
     var func = function (a, b) {
         if (arguments.length != 2) {
             return "bad args";
@@ -123 +122 @@
     };
     var self = {"value": 1, "func": func};
     var self2 = {"value": 2};
-    t.is( self.func(2, 3), 6, "setup for test is correct" );
+    t.is( self.func(2, 3), 6, "setup for partial test is correct" );
     self.funcTwo = partial(self.func, 2);
     t.is( self.funcTwo(3), 6, "partial application works" );
     t.is( self.funcTwo(3), 6, "partial application works still" );
@@ -131 +130 @@
     self.funcTwo = bind(bind(self.funcTwo, self2), null);
     t.is( self.funcTwo(3), 6, "re-unbinding partial application works" );
 
-    
+        
+    // test rpartial application
+    var func = function (a, b) {
+        if (arguments.length != 2) {
+            return "bad args";
+        } else {
+            return this.value + a + b;
+        }
+    };
+    var self = {"value": 1, "func": func};
+    var self2 = {"value": 2};
+    t.is( self.func(2, 3), 6, "setup for rpartial test is correct" );
+    self.funcRThree = rpartial(self.func, 3);
+    t.is( self.funcRThree(2), 6, "rpartial application works" );
+    t.is( self.funcRThree(2), 6, "rpartial application works still" );
+    t.is( bind(self.funcRThree, self2)(2), 7, "rebinding rpartial works" );
+    self.funcBetween = bind(bind(self.funcRThree, self2), null);
+    t.is( self.funcRThree(2), 6, "re-unbinding rpartial application works" );
+        
+        
+        // test partial and rpartial together
+    var func = function (a, b, c) {
+        if (arguments.length != 3) {
+            return "bad args";
+        } else {
+            return this.value + a + b + c;
+        }
+    };
+    var self = {"value": 1, "func": func};
+    var self2 = {"value": 2};
+    t.is( self.func(2, 3, 4), 10, "setup for partial-rpartial test is correct" );
+    self.funcBetween = rpartial(partial(self.func, 2), 4);
+    t.is( self.funcBetween(3), 10, "partial-rpartial application works" );
+    t.is( self.funcBetween(3), 10, "partial-rpartial application works still" );
+    self.funcBetween = partial(rpartial(self.func, 4), 2);
+    t.is( self.funcBetween(3), 10, "rpartial-partial application works" );
+    t.is( self.funcBetween(3), 10, "rpartial-partial application works still" );
+    t.is( bind(self.funcBetween, self2)(3), 11, "rebinding partial-rpartial works" );
+    self.funcBetween = bind(bind(self.funcBetween, self2), null);
+    t.is( self.funcBetween(3), 10, "re-unbinding partial-rpartial application works" );
+   
     // nodeWalk test
     // ... looks a lot like a DOM tree on purpose
     var tree = {