Changeset 136:bfdb6e432cb8

Timestamp:

07/05/07 15:23:03 (14 months ago)

Author:

Tarek Ziad?? <tarek@…>

Message:

finalized v1

Location:

mailer

Files:

• __init__.py (added)
• doc/mailer.txt (modified) (4 diffs)
• mailer.py (modified) (3 diffs)
• model.py (modified) (2 diffs)
• sender.py (modified) (1 diff)
• settings.py (modified) (1 diff)
• tests/__init__.py (added)
• tests/test_docs.py (modified) (1 diff)
• tests/test_mailer.py (added)

mailer/doc/mailer.txt

@@ -19 +19 @@
     >>> from sender import send_mail
     >>> mail_id = send_mail(sender='tarek@ziade.org',
-    ...                     recipients=['tarek@ziade.org'],
+    ...                     recipients=['ziade.tarek@gmail.com'],
     ...                     subject='hello',
-    ...                     msg='hello')
+    ...                     msg='héllo')
 
 
@@ -31 +31 @@
     >>> from sender import mail_status
     >>> mail_status(mail_id)
-    'processing'
+    u'processing'
+
+When the id is not given, the whole mailed table is returned::
+
+    >>> mail_status()
+    []
+
+We can ask for the queue size as well::
+
+    >>> from sender import mail_queue_size
+    >>> mail_queue_size()
+    1
+
+
 
 sending mails, for real
@@ -46 +59 @@
 
     >>> import time
-    >>> while mail_status(mail_id) == 'processing':
+    >>> while mail_status(mail_id) == u'processing':
     ...     time.sleep(0.2)
     >>> mail_status(mail_id)
@@ -55 +68 @@
     >>> stop_server()
 
+And see the status::
 
+    >>> status = mail_status()
+    >>> status[0]['subject']
+    u'hello'
+    >>> status[0]['status']
+    u'processed'
 

mailer/mailer.py

@@ -23 +23 @@
 import os
 import sys
+import smtplib
 import logging
 from threading import Thread
 import time
+from base64 import b64decode
+from email.MIMEText import MIMEText
 
 from model import mailed_data, mail_data
+import settings
 
 class MailWorker(Thread):
@@ -41 +45 @@
         return mail_data.select().execute().fetchall()
 
+    def _get_message(self, mail):
+        """returns a Mime"""
+        msg = MIMEText(b64decode(mail.data))
+        msg['From'] = mail.sender
+        msg['To'] = mail.recipients
+        msg['Subject'] = mail.subject
+
+        msg['Date'] = mail.date.isoformat()
+        return msg
+
     def _send_mail(self, mail):
         """sends the mail"""
-        pass
+        server = smtplib.SMTP(settings.SMTP_SERVER)
+        msg = self._get_message(mail)
+        try:
+            server.sendmail(msg['From'], msg['To'], msg.as_string())
+        finally:
+            server.quit()
 
     def _store_mail(self, mail, error=None):
@@ -56 +75 @@
 
         # removes from original table
-        mailed_data.delete().execute(id=mail.id)
+        mail_data.delete().execute(id=mail.id)
 
     def run(self):

mailer/model.py

@@ -39 +39 @@
                    Column('sender', String(300)),
                    Column('recipients', String(300)),
-                   Column('date', Date()),
+                   Column('date', DateTime()),
                    Column('data', TEXT()))
 
@@ -56 +56 @@
                    Column('error', String(300)),
                    Column('data', TEXT()),
-                   Column('date', Date()),
+                   Column('date', DateTime()),
                    Column('status', String(10)),)
 

mailer/sender.py

@@ -34 +34 @@
     return res.last_inserted_ids()[0]
 
-def mail_status(mail_id):
+def mail_status(mail_id=None):
     """getting mail status"""
+    def _small(mail):
+        return {'subject': mail.subject, 'date': mail.date,
+                'status': mail.status}
+
+    if mail_id is None:
+        return [_small(mail) for mail in
+                mailed_data.select().execute()]
+
     res = mailed_data.select().execute(original_id=mail_id).fetchall()
     if len(res) == 0:
         # still in queue
-        return 'processing'
+        return u'processing'
     return res[0].status
 
+def mail_queue_size():
+    """return the queue size"""
+    return len(mail_data.select().execute().fetchall())
+

mailer/settings.py

@@ -1 +1 @@
 
 DATABASE = 'postgres://chainon:chainon@localhost/chainon'
+SMTP_SERVER = 'smtp.neuf.fr'
 

mailer/tests/test_docs.py

@@ -55 +55 @@
 if current_dir == '':
     current_dir = '.'
+current_dir = os.path.realpath(current_dir)
 
 def test_suite():
     globs = globals()
     test_db = os.path.join(current_dir, 'test.db')
-    globs['test_db'] = 'sqlite://%s' % test_db
+    if os.path.exists(test_db):
+        os.remove(test_db)
+
+    globs['test_db'] = 'sqlite:////%s' % test_db
     return doc_suite(current_dir, globs=globs)