Changeset 95

Timestamp:

06/19/07 17:05:57 (2 years ago)

Author:

David Rousselie <dax@happycoders.org>

Message:

Add Extended Stanza Addressing support

Add 'replyto' address in messages sent by JMC

Files:

• src/jmc/jabber/component.py (modified) (4 diffs)
• src/jmc/jabber/tests/component.py (modified) (7 diffs)

src/jmc/jabber/component.py

@@ -29 +29 @@
-
-from pyxmpp.message import Message
+from pyxmpp.jid import JID
-
-from jcl.model.account import Account, PresenceAccount, LegacyJID
@@ -157 +158 @@
-                        while mail_index is not None:
-                            (body, email_from) = _account.get_mail(mail_index)
-
+
+
-                                               % (email_from),
-                                           body))
@@ -173 +175 @@
-                            new_mail_count += 1
-                        if body != "":
-
+
+
-                                               % (new_mail_count),
-                                           body))
@@ -192 +195 @@
-        return result
-
-MessageSender, 
+
-    """Send emails messages to jabber users"""
-
-
+
+
+
+
+
-        """Send given emails (in data) as Jabber messages"""
+        email_from, subject, body = data
-        if to_account.action == MailAccount.RETRIEVE:
-
+
+
+
+
+
+
+
+
+
+
+
-        elif to_account.action == MailAccount.DIGEST:
-
+
+
+
+
+
-
-class MailHandler(Handler):

src/jmc/jabber/tests/component.py

@@ -43 +43 @@
-    RootSendMailMessageHandler, MailHandler, MailSubscribeHandler, \
-    MailUnsubscribeHandler, NoAccountError, MailFeederHandler, \
-
+, MailSender
-from jmc.lang import Lang
-
@@ -146 +146 @@
-    def __init__(self):
-        self.default_from = "user1@test.com"
-
+
-    def create_email(self, from_email, to_email, subject, body):
-        return (from_email, to_email, subject, body)
-
+
-    def send_email(self, email):
-        self.email = email
@@ -340 +340 @@
-    def test_feed_retrieve_mail(self):
-        def mock_get_mail(index):
- \
+
-                    ("body2", "from2@test.com")][index]
-        account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
- = "test1@test.com", \
- = "account11", \
- = 
+="test1@test.com",
+="account11",
+=
-        account11._action = MailAccount.RETRIEVE
-        account11.status = account.ONLINE
@@ -361 +361 @@
-        self.assertEquals(len(self.comp.stream.sent), 0)
-        self.assertEquals(len(result), 2)
-
+
+
+
-                          account11.default_lang_class.new_mail_subject \
-                          % ("from1@test.com"))
-
-
+
+
+
+
-                          account11.default_lang_class.new_mail_subject \
-                          % ("from2@test.com"))
-1
+2
-        del account.hub.threadConnection
-
@@ -415 +419 @@
-        self.assertEquals(len(self.comp.stream.sent), 0)
-        self.assertEquals(len(result), 1)
-0
+1
-                          account11.default_lang_class.new_digest_subject \
-                          % (2))
-1
+2
-                          "body1\n----------------------------------\nbody2\n----------------------------------\n")
-        del account.hub.threadConnection
@@ -677 +681 @@
-        self.assertEquals(result[0].get_body(),
-                          Lang.en.send_mail_error_no_to_header_body)
+
+class MailSender_TestCase(unittest.TestCase):
+    def setUp(self):
+        if os.path.exists(DB_PATH):
+            os.unlink(DB_PATH)
+        account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
+        Account.createTable(ifNotExists=True)
+        PresenceAccount.createTable(ifNotExists=True)
+        MailAccount.createTable(ifNotExists=True)
+        IMAPAccount.createTable(ifNotExists=True)
+        POP3Account.createTable(ifNotExists=True)
+        del account.hub.threadConnection
+
+    def tearDown(self):
+        account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
+        POP3Account.dropTable(ifExists=True)
+        IMAPAccount.dropTable(ifExists=True)
+        MailAccount.dropTable(ifExists=True)
+        PresenceAccount.dropTable(ifExists=True)
+        Account.dropTable(ifExists=True)
+        del TheURIOpener.cachedURIs['sqlite://' + DB_URL]
+        account.hub.threadConnection.close()
+        del account.hub.threadConnection
+        if os.path.exists(DB_PATH):
+            os.unlink(DB_PATH)
+
+    def test_create_message(self):
+        mail_sender = MailSender()
+        account.hub.threadConnection = connectionForURI('sqlite://' + DB_URL)
+        account11 = IMAPAccount(user_jid="test1@test.com",
+                                name="account11",
+                                jid="account11@jmc.test.com")
+        account11.online_action = MailAccount.RETRIEVE
+        account11.status = account.ONLINE
+        message = mail_sender.create_message(account11, ("from@test.com",
+                                                         "subject",
+                                                         "message body"))
+        self.assertEquals(message.get_to(), account11.user_jid)
+        del account.hub.threadConnection
+        self.assertEquals(message.get_subject(), "subject")
+        self.assertEquals(message.get_body(), "message body")
+        addresses = message.xpath_eval("add:addresses/add:address",
+                                       {"add": "http://jabber.org/protocol/address"})
+        self.assertEquals(len(addresses), 1)
+        self.assertEquals(addresses[0].prop("type"),
+                          "replyto")
+        self.assertEquals(addresses[0].prop("jid"),
+                          "from%test.com@jmc.test.com")
-
-class MailHandler_TestCase(unittest.TestCase):
@@ -928 +980 @@
-    suite.addTest(unittest.makeSuite(MailAccountManager_TestCase, 'test'))
-    suite.addTest(unittest.makeSuite(RootSendMailMessageHandler_TestCase, 'test'))
+    suite.addTest(unittest.makeSuite(MailSender_TestCase, 'test'))
-    suite.addTest(unittest.makeSuite(MailHandler_TestCase, 'test'))
-    suite.addTest(unittest.makeSuite(MailUnsubscribeHandler_TestCase, 'test'))