Merge pull request 0rpc#17 from lopter/master

bombela · bombela · commit 3458689e8705 · 2012-04-02T17:59:52.000-07:00
Add the methods argument in the Subscriber and Puller constructors
diff --git a/tests/test_pubpush.py b/tests/test_pubpush.py
@@ -29,8 +29,8 @@
 import zerorpc
 
 
-def test_pushpull():
-    endpoint = 'ipc://test_pushpull'
+def test_pushpull_inheritance():
+    endpoint = 'ipc://test_pushpull_inheritance'
 
     pusher = zerorpc.Pusher()
     pusher.bind(endpoint)
@@ -52,11 +52,11 @@ def lolita(self, a, b):
     print 'done'
 
 
-def test_pubsub():
-    endpoint = 'ipc://test_pubsub'
+def test_pubsub_inheritance():
+    endpoint = 'ipc://test_pubsub_inheritance'
 
-    pusher = zerorpc.Publisher()
-    pusher.bind(endpoint)
+    publisher = zerorpc.Publisher()
+    publisher.bind(endpoint)
     trigger = gevent.event.Event()
 
     class Subscriber(zerorpc.Subscriber):
@@ -65,11 +65,59 @@ def lolita(self, a, b):
             assert a + b == 3
             trigger.set()
 
-    puller = Subscriber()
+    subscriber = Subscriber()
+    subscriber.connect(endpoint)
+    gevent.spawn(subscriber.run)
+
+    trigger.clear()
+    publisher.lolita(1, 2)
+    trigger.wait()
+    print 'done'
+
+
+def test_pushpull_composite():
+    endpoint = 'ipc://test_pushpull_composite'
+    trigger = gevent.event.Event()
+
+    class Puller(object):
+        def lolita(self, a, b):
+            print 'lolita', a, b
+            assert a + b == 3
+            trigger.set()
+
+    pusher = zerorpc.Pusher()
+    pusher.bind(endpoint)
+
+    service = Puller()
+    puller = zerorpc.Puller(service)
     puller.connect(endpoint)
     gevent.spawn(puller.run)
 
     trigger.clear()
     pusher.lolita(1, 2)
     trigger.wait()
     print 'done'
+
+
+def test_pubsub_composite():
+    endpoint = 'ipc://test_pubsub_composite'
+    trigger = gevent.event.Event()
+
+    class Subscriber(object):
+        def lolita(self, a, b):
+            print 'lolita', a, b
+            assert a + b == 3
+            trigger.set()
+
+    publisher = zerorpc.Publisher()
+    publisher.bind(endpoint)
+
+    service = Subscriber()
+    subscriber = zerorpc.Subscriber(service)
+    subscriber.connect(endpoint)
+    gevent.spawn(subscriber.run)
+
+    trigger.clear()
+    publisher.lolita(1, 2)
+    trigger.wait()
+    print 'done'
diff --git a/zerorpc/core.py b/zerorpc/core.py
@@ -362,8 +362,7 @@ def __getattr__(self, method):
 
 class Puller(SocketBase):
 
-    def __init__(self, methods=None, name=None, context=None,
-            zmq_socket=zmq.PULL):
+    def __init__(self, methods=None, context=None, zmq_socket=zmq.PULL):
         super(Puller, self).__init__(zmq_socket, context=context)
 
         if methods is None:
@@ -413,6 +412,7 @@ def __init__(self, context=None):
 
 class Subscriber(Puller):
 
-    def __init__(self, context=None):
-        super(Subscriber, self).__init__(context=context, zmq_socket=zmq.SUB)
+    def __init__(self, methods=None, context=None):
+        super(Subscriber, self).__init__(methods=methods, context=context,
+                zmq_socket=zmq.SUB)
         self._events.setsockopt(zmq.SUBSCRIBE, '')
