Changeset 5:573fdae8b1f6 in mailjam for postman/daemon.py

Timestamp:

May 16, 2012, 11:41:47 AM (13 years ago)

Author:

Francisco de Borja Lopez Rio <borja@…>

Branch:

default

Phase:

public

Message:

Added tests for postman.daemon.Postman

Added a method to postman.daemon.Postman to "clear" all the storage associated
to a given postman instance (removing all the files from disk)

Fixed some bugs, mostly caused by typos through the sources, detected while
writing more tests

Removed the storage and archive attributes from postman.models.MailingList,
now they are methods "marked" as properties using the @property decorator.
This keeps the storage objects from being serialized into json objects by
the storage backend (de-serializing them caused some trouble and it is not
necessary at all)

Added create() and delete() methods to postman.storage.JsonStorage. the first
one ensures the path to the storage file exists (creating all subdirs if
necessary) and the second one deletes the storage file from disk

File:

• postman/daemon.py (modified) (4 diffs)

postman/daemon.py

@@ -42 +42 @@
             for m in self.mailings.keys():            
                 self.mailings[m].save()
+            return True
+        return False
 
     def load(self):
@@ -59 +61 @@
                 mailing.load()
                 self.mailings[address] = mailing                
-            
+            return True
+        return False
 
-    def add_mailing_list(self, list_info={}):
+    def clear(self):
+        """
+        Delete all stored data from disk (useful for testing).
+        DANGER: Calling this method will remove all data from disk, leaving the
+        postman instance with no persistence data, if the postman process die,
+        before another .save() call is made, all data will be lost.
+        """
+        if self.dbs['mailings'].exists():
+            # We do not delete each mailing list file, but only the file
+            # containing the list of existing mailing lists
+            self.dbs['mailings'].delete()
+            return True
+        return False
+
+    def add_mailing_list(self, info={}):
         """
         Add a new mailing list to this postman instance. expects one parameter,
-        list_info, which is a dictionary that should contain, at least, the
+        info, which is a dictionary that should contain, at least, the
         following keys:
 
@@ -72 +89 @@
          
         """
-        if not isinstance(list_info, dict):
-            raise TypeError(list_info, ' is not a valid dictionary')
+        if not isinstance(info, dict):
+            raise TypeError(info, ' is not a valid dictionary')
 
-        if 'name' not in list_info.keys() or \
-           'address' not in list_info.keys() or \
-           'members' not in list_info.keys():
-            raise ValueError(list_info, ' does not seem to be a valid configuration')
+        if 'name' not in info.keys() or \
+           'address' not in info.keys() or \
+           'members' not in info.keys() or \
+           'config' not in info.keys():
+            raise ValueError(info, ' does not seem to be a valid configuration')
         
-        if list_info['address'] in self.mailings_addresses:
-            raise IndexError(list_info['address'],
+        if info['address'] in self.mailings_addresses:
+            raise IndexError(info['address'],
                              ' has been already added to postman')
 
-        mailing = MailingList(list_info['name'], list_info['address'],
-                              list_info['members'])        
+        mailing = MailingList(info['name'], info['address'],
+                              info['members'], info['config'])        
         self.mailings[mailing.address] = mailing
         self.mailings_addresses.append(mailing.address)
         # After adding new mailings, save them to disk
         self.save()
+        return True
         
     def add_mailing_member(self, member_addr=None, list_addr=None):
@@ -109 +128 @@
             raise IndexError(list_addr, ' is not a valid mailing list')
 
-        member = Member(member_addr)
-        
+        added = self.mailings[list_addr].add_member_by_address(member_addr)
+        if added:
+            self.save()
+        return added