Added the HSETNX command

README.md

@@ -1,33 +1,40 @@
 brükva
 ========
 
-Asynchronous [Redis](http://redis-db.com/) client that works within [Tornado](http://tornadoweb.org/) IO loop.
-
+Asynchronous [Redis](http://redis.io/) client that works within [Tornado](http://tornadoweb.org/) IO loop.
 
 Usage
 -----
 
-    >>> import brukva
-    >>> c = brukva.Client()
-    >>> c.connect()
-    >>> def on_result(result):
-           (error, data) = result
-           print data or error
-    >>> c.set('foo', 'bar', on_result)
-    >>> c.get('foo', on_result)
-    >>> c.hgetall('foo', on_result)
-    >>> c.connection._stream.io_loop.start() # start tornado mainloop
+Input:
+
+    import logging
+    logging.basicConfig()
+    import brukva
+    c = brukva.Client()
+    c.connect()
+    loop = c.connection._stream.io_loop
+    def on_result(result):
+        print result
+    c.set('foo', 'bar', on_result)
+    c.get('foo', on_result)
+    c.hgetall('foo', [on_result, lambda r: loop.stop()])
+    loop.start() # start tornado mainloop
+
+Output:
+
     True
     bar
+    ERROR:brukva.client:ResponseError (on HGETALL [('foo',), {}]): Operation against a key holding the wrong kind of value
     ResponseError (on HGETALL [('foo',), {}]): Operation against a key holding the wrong kind of value
 
-
 Tips on testing
 ---------------
 
+Run redis-server on localhost:6379 with option "timeout 1".
 Run tests with the following command:
 
-    nosetests -s -w tests --nologcapture
+    ./run_nose.sh
 
 
 Credits
@@ -42,4 +49,3 @@ License
 -------
 See LICENSE file.
 Long story short: WTFPL v2
-

brukva/adisp.py

@@ -90,19 +90,27 @@ def get_stat():
 responses corresponding to given urls.
 '''
 from functools import partial
+from tornado.ioloop import IOLoop
 
 class CallbackDispatcher(object):
     def __init__(self, generator):
+        self.io_loop = IOLoop.instance()
         self.g = generator
         try:
             self.call(self.g.next())
         except StopIteration:
             pass
 
+    def _queue_send_result(self, result, single):
+        self.io_loop.add_callback(partial(self._send_result, result, single))
+
     def _send_result(self, results, single):
         try:
             result = results[0] if single else results
-            self.call(self.g.send(result))
+            if isinstance(result, Exception):
+                self.call(self.g.throw(result))
+            else:
+                self.call(self.g.send(result))
         except StopIteration:
             pass
 
@@ -113,7 +121,7 @@ def call(self, callers):
         self.call_count = len(list(callers))
         results = [None] * self.call_count
         if self.call_count == 0:
-            self._send_result(results, single)
+            self._queue_send_result(results, single)
         else:
             for count, caller in enumerate(callers):
                 caller(callback=partial(self.callback, results, count, single))
@@ -123,7 +131,7 @@ def callback(self, results, index, single, arg):
         results[index] = arg
         if self.call_count > 0:
             return
-        self._send_result(results, single)
+        self._queue_send_result(results, single)
 
 def process(func):
     def wrapper(*args, **kwargs):