Merge lp:~ricardokirkner/lalita/nick-changed into lp:lalita

[Ricardo Kirkner]

This branch adds the necessary support for plugins to be able to handle when a user changes his nick.

[lp:~ricardokirkner/lalita/nick-changed]

156. By Ricardo Kirkner on 2010-06-22

added tests for making sure push handles all events

[Facundo Batista (facundo)]

Looks ok!

review: Approve

=== modified file 'lalita/core/dispatcher.py'
--- lalita/core/dispatcher.py	2010-06-14 23:42:28 +0000
+++ lalita/core/dispatcher.py	2010-06-22 00:14:22 +0000
@@ -51,11 +51,12 @@
     events.TALKED_TO_ME: 1,
     events.COMMAND: 1,
     events.PUBLIC_MESSAGE: 1,
+    events.ACTION: 1,
     events.JOIN: 1,
     events.LEFT: 1,
     events.QUIT: None,
     events.KICK: 1,
-    events.ACTION: 1,
+    events.RENAME: None,
 }
 
 # the position of the user parameter in each event
@@ -68,11 +69,12 @@
     events.TALKED_TO_ME: 0,
     events.COMMAND: 0,
     events.PUBLIC_MESSAGE: 0,
+    events.ACTION: 0,
     events.JOIN: 0,
     events.LEFT: 0,
     events.QUIT: 0,
     events.KICK: 0,
-    events.ACTION: 0,
+    events.RENAME: 0,
 }
 
 

=== modified file 'lalita/core/events.py'
--- lalita/core/events.py	2009-10-20 03:35:45 +0000
+++ lalita/core/events.py	2010-06-22 00:14:22 +0000
@@ -15,3 +15,4 @@
 LEFT = 10
 QUIT = 11
 KICK = 12
+RENAME = 13

=== modified file 'lalita/core/tests/test_dispatcher.py'
--- lalita/core/tests/test_dispatcher.py	2010-06-12 03:29:09 +0000
+++ lalita/core/tests/test_dispatcher.py	2010-06-22 00:14:22 +0000
@@ -204,6 +204,28 @@
         self.disp.push(events.CONNECTION_MADE)
         return self.deferred
 
+    def test_events_supported(self):
+        def test(*args):
+            self.deferred.callback(True)
+        self.helper.test = test
+
+        supported_events = [getattr(events, name) for name in dir(events) \
+                            if name == name.upper()]
+        for event in supported_events:
+            self.disp.register(event, self.helper.f)
+            if (event in dispatcher.USER_POS and 
+                dispatcher.USER_POS[event] is not None):
+                self.disp.push(event, 'user', 'channel', 'msg')
+            elif (event in dispatcher.CHANNEL_POS and
+                  dispatcher.CHANNEL_POS[event] is not None):
+                if event == events.JOINED:
+                    self.disp.push(event, 'channel', 'user', 'msg')
+                else:
+                    self.disp.push(event, 'user', 'channel', 'msg')
+            else:
+                self.disp.push(event)
+        return self.deferred
+
 
 class TestEvents(EasyDeferredTests):
     '''Test all the events.'''

=== modified file 'lalita/core/tests/test_events.py'
--- lalita/core/tests/test_events.py	2010-06-07 02:30:54 +0000
+++ lalita/core/tests/test_events.py	2010-06-22 00:14:22 +0000
@@ -203,3 +203,9 @@
         bot.userKicked("user", "chnl", "op", "bad behaviour")
         self.check_pushed(events.KICK, "user", "chnl", "op", "bad behaviour")
         return self.deferred
+
+    def test_userRenamed(self):
+        '''Calling bot.userRenamed'''
+        bot.userRenamed('oldname', 'newname')
+        self.check_pushed(events.RENAME, 'oldname', 'newname')
+        return self.deferred

=== modified file 'lalita/ircbot.py'
--- lalita/ircbot.py	2010-06-14 00:36:06 +0000
+++ lalita/ircbot.py	2010-06-22 00:14:22 +0000
@@ -207,6 +207,11 @@
                      kickee, channel, kicker, message)
         self.dispatcher.push(events.KICK, kickee, channel, kicker, message)
 
+    def userRenamed(self, oldname, newname):
+        """Called when I see another user to change their nick."""
+        logger.debug("%s changed its nick to %s", oldname, newname)
+        self.dispatcher.push(events.RENAME, oldname, newname)
+
 
 class IRCBotFactory(protocol.ReconnectingClientFactory):
     """