support for keyword arguments in PyQuery custom functions (PyQuery.fn…

…); hook tests

pyquery/pyquery.py

@@ -1393,9 +1393,9 @@ class Fn(object):
 
         """
         def __setattr__(self, name, func):
-            def fn(self, *args):
+            def fn(self, *args, **kwargs):
                 func_globals(func)['this'] = self
-                return func(*args)
+                return func(*args, **kwargs)
             fn.__name__ = name
             setattr(PyQuery, name, fn)
     fn = Fn()

tests/test_pyquery.py

@@ -309,6 +309,32 @@ def test_parameterless_callback(self):
                                      ['Coffee', 'Tea', 'Milk'])
 
 
+class TestHook(TestCase):
+    html = """
+        <ol>
+            <li>Coffee</li>
+            <li>Tea</li>
+            <li>Milk</li>
+        </ol>
+    """
+
+    def test_fn(self):
+        "Example from `PyQuery.Fn` docs."
+        fn = lambda: this.map(lambda i, el: pq(this).outerHtml())
+        pq.fn.listOuterHtml = fn
+        S = pq(self.html)
+        self.assertEqual(S('li').listOuterHtml(),
+                         ['<li>Coffee</li>', '<li>Tea</li>', '<li>Milk</li>'])
+
+    def test_fn_with_kwargs(self):
+        "fn() with keyword arguments."
+        pq.fn.test = lambda p=1: pq(this).eq(p)
+        S = pq(self.html)
+        self.assertEqual(S('li').test(0).text(), 'Coffee')
+        self.assertEqual(S('li').test().text(), 'Tea')
+        self.assertEqual(S('li').test(p=2).text(), 'Milk')
+
+
 class TestAjaxSelector(TestSelector):
     klass = pqa