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

Timestamp:

May 16, 2012, 11:41:47 AM (12 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/models.py (modified) (4 diffs)

postman/models.py

@@ -33 +33 @@
     """
 
-    def __init__(self, name, address, members={}, config={}, storage=None):
+    def __init__(self, name, address, members={}, config={}):
         self.name = name
         self.address = address
@@ -39 +39 @@
         self.config = config
         self._validate_config() # validate the config parameters
-        self.storage = Storage(os.path.join(self.config['storage'],
-                                            self.address))
-        self.archive = Storage(os.path.join(self.config['archive'],
-                                            self.address))        
         
     def __repr__(self):
@@ -72 +68 @@
             raise ValueError(address, ' is not a valid email address')
         return address in self.members_addresses()
-        
+
+    @property
+    def storage(self):
+        return Storage(os.path.join(self.config['storage'], self.address))
+
+    @property
+    def archive(self):
+        return Storage(os.path.join(self.config['archive'], self.address))
+    
     def members_addresses(self):
         return self.members.keys()
@@ -97 +101 @@
         return True
 
+    def info(self):
+        """
+        Returns a dict we can use to add this mailing list to a postman
+        instance
+        """
+        # FIXME: This code could be replaced with something that
+        # automagically generates the dict from the instance attributes
+        return {'name': self.name, 'address': self.address,
+                'members': self.members, 'config': self.config}
+
     def load(self):
         if self.storage.exists():