Changeset 94

Timestamp:

06/18/07 20:46:42 (2 years ago)

Author:

David Rousselie <dax@happycoders.org>

Message:

Add multiple identities to JMC

Files:

• src/jmc.py (modified) (1 diff)
• src/jmc/jabber/component.py (modified) (5 diffs)
• src/jmc/jabber/tests/component.py (modified) (3 diffs)
• src/jmc/runner.py (modified) (1 diff)

src/jmc.py

@@ -28 +28 @@
-import jmc
-from jmc.runner import JMCRunner
+from jmc.lang import Lang
-
-if __name__ == "__main__":
-
+
+
-    runner.configure()
-    runner.run()

src/jmc/jabber/component.py

@@ -32 +32 @@
-from jcl.model.account import Account, PresenceAccount, LegacyJID
-from jcl.jabber.component import Handler, DefaultSubscribeHandler, \
-
+, AccountManager
-from jcl.jabber.feeder import FeederComponent, Feeder, MessageSender, \
-    HeadlineSender, FeederHandler
@@ -53 +53 @@
-                 port,
-                 db_connection_str,
- = 
+=
-        """Use FeederComponent behavior and setup feeder and sender
-        attributes.
@@ -65 +65 @@
-                                 lang=lang)
-        self.handler = MailFeederHandler(MailFeeder(self), MailSender(self))
+        self.account_manager = MailAccountManager(self)
-        self.account_manager.account_classes = (IMAPAccount,
-                                                POP3Account,
@@ -74 +75 @@
-        self.available_handlers += [MailPresenceHandler()]
-        self.unavailable_handlers += [MailPresenceHandler()]
+
+class MailAccountManager(AccountManager):
+    """JMC specific account behavior"""
+
+    def root_disco_get_info(self, name, category, type):
+        """Add jabber:iq:gateway support"""
+        disco_info = AccountManager.root_disco_get_info(self, name, category, type)
+        disco_info.add_feature("jabber:iq:gateway")
+        disco_info.add_identity(name, "headline", "newmail")
+        return disco_info
-
-class MailFeeder(Feeder):
@@ -253 +264 @@
-class RootSendMailMessageHandler(SendMailMessageHandler):
-    """Handle message sent to root JID"""
-
+
-    def __init__(self):
-        SendMailMessageHandler.__init__(self)

src/jmc/jabber/tests/component.py

@@ -43 +43 @@
-    RootSendMailMessageHandler, MailHandler, MailSubscribeHandler, \
-    MailUnsubscribeHandler, NoAccountError, MailFeederHandler, \
-
+, MailAccountManager
-from jmc.lang import Lang
-
@@ -549 +549 @@
-        self.assertEquals(result[0].get_body(),
-                          Lang.en.send_mail_ok_body % ("user@test.com"))
+
+class MailAccountManager_TestCase(unittest.TestCase):
+    def test_root_disco_get_info(self):
+        mam = MailAccountManager(None)
+        disco_info = mam.root_disco_get_info("JMC", "gateway", "smtp")
+        self.assertTrue(disco_info.has_feature("jabber:iq:gateway"))
+        self.assertEquals(len(disco_info.get_identities()), 2)
+        self.assertTrue(disco_info.identity_is("gateway", "smtp"))
+        self.assertTrue(disco_info.identity_is("headline", "newmail"))
-
-class RootSendMailMessageHandler_TestCase(unittest.TestCase):
@@ -917 +926 @@
-    suite.addTest(unittest.makeSuite(MailComponent_TestCase, 'test'))
-    suite.addTest(unittest.makeSuite(SendMailMessageHandler_TestCase, 'test'))
+    suite.addTest(unittest.makeSuite(MailAccountManager_TestCase, 'test'))
-    suite.addTest(unittest.makeSuite(RootSendMailMessageHandler_TestCase, 'test'))
-    suite.addTest(unittest.makeSuite(MailHandler_TestCase, 'test'))

src/jmc/runner.py

@@ -63 +63 @@
-            MailAccount.default_encoding = self.mail_default_encoding
-            component.check_interval = self.check_interval
+            component.disco_identity.set_category("gateway")
+            component.disco_identity.set_type("smtp")
-            component.run()
-        self._run(run_func)