Changeset 108 for trunk

Timestamp:

10/26/08 09:03:50 (2 months ago)

Author:

fs

Message:

fixes #79

Location:

trunk

Files:

• tests/test_custom_provider_injection.py (modified) (1 diff)
• tests/test_message.py (modified) (3 diffs)
• turbomail/message.py (modified) (6 diffs)

trunk/tests/test_custom_provider_injection.py

@@ -29 +29 @@
         self.manager = DummyManager()
         self.provider = DummyProvider()
-        self.message = Message(from_=("Author", "author@example.com"),
+        self.message = Message(author=("Author", "author@example.com"),
                                to=("Recipient", "recipient@example.com"),
                                subject="Test message subject.",

trunk/tests/test_message.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # encoding: utf-8
-
 """Test the TurboMail Message class."""
 
@@ -12 +11 @@
     from email.MIMEText import MIMEText
 import logging
+import re
 import unittest
 
@@ -90 +90 @@
         
         msg = email.message_from_string(str(self.message))
-        encoded_name = "%s <%s>" % ( str(Header(from_name, "ISO-8859-1")), from_email)
+        encoded_name = "%s <%s>" % (str(Header(from_name, "ISO-8859-1")), from_email)
         self.assertEqual(encoded_name, msg['From'])
+    
+    def test_multiple_authors(self):
+        """For better readability, provide a property 'authors' (alias for 
+        author)."""
+        self.message.authors = 'foo@example.com'
+        self.assertEqual(self.message.authors, self.message.author)
+        
+        self.message.authors = ['bar@example.com', 'baz@example.com']
+        self.message.sender = 'foo@example.com'
+        msg = email.message_from_string(str(self.message))
+        from_addresses = re.split(r",\n?\s+", msg['From'])
+        self.assertEqual(['bar@example.com', 'baz@example.com'], from_addresses)
+    
+    def test_multiple_authors_require_sender(self):
+        self.message.authors = ['bar@example.com', 'baz@example.com']
+        self.assertRaises(ValueError, str, self.message)
+        
+        self.message.sender = 'bar@example.com'
+        str(self.message)
+    
+    def test_permit_one_sender_at_most(self):
+        self.message.sender = ['bar@example.com', 'baz@example.com']
+        self.assertRaises(ValueError, str, self.message)
+        
+        self.message.sender = 'bar@example.com'
+        str(self.message)
+    
+    def test_raise_error_for_unknown_kwargs_at_class_instantiation(self):
+        self.assertRaises(TypeError, Message, invalid_argument=True)
+
+

trunk/turbomail/message.py

@@ -4 +4 @@
 __version__ = "$Revision$"
 
-from turbomail import release
-from turbomail.util import AddressList
-from turbomail.control import interface
 import os
+import logging
 
 import email.Message
@@ -18 +16 @@
 from email.Header import Header
 
-import logging
+from turbomail import release
+from turbomail.util import AddressList
+from turbomail.control import interface
+
+
+__all__ = ['WrappedMessage', 'Message']
+
 log = logging.getLogger("turbomail.message")
 
-
-__all__ = ['WrappedMessage', 'Message']
 
 
@@ -55 +57 @@
         """
         super(Message, self).__init__()
-        # if sender != None and author == None -> warning, sender -> author, sender=None
-        # if recipient != None and to == None -> warning, recipient -> to
-        # recipients support later
         
         def kwpop(name, configkey=None, default=None):
             value = None
             if configkey != None:
-                value = kw.get(name, interface.config.get(configkey, default))
+                value = kw.pop(name, interface.config.get(configkey, default))
             else:
-                value = kw.get(name, default)
+                value = kw.pop(name, default)
             return value
         
@@ -95 +94 @@
         self._processed = False
         self._dirty = False
-    
+        if len(kw) > 0:
+            parameter_name = kw.keys()[0]
+            error_msg = "__init__() got an unexpected keyword argument '%s'"
+            raise TypeError(error_msg % parameter_name)
     
     author = AddressList.protected('_author')
@@ -105 +107 @@
     disposition = AddressList.protected('_disposition')
     
+    # just for better readability if you have multiple authors
+    authors = author
     
     def __setattr__(self, name, value):
@@ -169 +173 @@
         assert self.to or self.cc or self.bcc, "You must specify at least one recipient."
         assert self.plain, "You must provide plain text content."
-
+        
+        if len(self.author) > 1 and len(self.sender) == 0:
+            raise ValueError('If there are multiple authors of message, you must specify a sender!')
+        if len(self.sender) > 1:
+            raise ValueError('You must not specify more than one sender!')
+        
         if not self._dirty and self._processed and not interface.config.get("mail.debug", False):
             return self._mime