Cleaned up event decorator a bit.

mrjoes · mrjoes · commit fe9b8a6485dc · 2011-11-29T10:59:21.000+02:00
diff --git a/doc/events.rst b/doc/events.rst
@@ -39,6 +39,14 @@ To handle event on client side, use following code:
 However, take care - if method signature does not match (missing parameters, extra
 parameters, etc), your connection will blow up and self destruct.
 
+``event`` decorator can be used without parameter and it will use event handler name
+in this case::
+
+    class MyConnection(SocketConnection):
+        @event
+        def hello(self, name):
+            print 'Hello %s' % name
+
 If you don't like this event handling approach, just override ``on_event`` in your
 socket connection class and handle them by yourself:
 ::
diff --git a/tornadio2/conn.py b/tornadio2/conn.py
@@ -26,14 +26,29 @@
 from tornadio2 import proto
 
 
-def event(name_or_f):
-    """Event handler decorator."""
-    if callable(name_or_f):
-        name_or_f._event_name = name_or_f.__name__
-        return name_or_f
+def event(name_or_func):
+    """Event handler decorator.
+
+    Can be used with event name or will automatically use function name
+    if not provided::
+
+        # Will handle 'foo' event
+        @event('foo')
+        def bar(self):
+            pass
+
+        # Will handle 'baz' event
+        @event
+        def baz(self):
+            pass
+    """
+
+    if callable(name_or_func):
+        name_or_func._event_name = name_or_func.__name__
+        return name_or_func
 
     def handler(f):
-        f._event_name = name_or_f
+        f._event_name = name_or_func
         return f
 
     return handler
