Add complex Account class

darcs-hash:20061028175554-86b55-a286c0e397f7bc3d9c9616db0c3f2f0c39a70bfa.gz

src/jcl/jabber/component.py

@@ -56,7 +56,7 @@ VERSION = "0.1"
 ###############################################################################
 # JCL implementation
 ###############################################################################
-class JCLComponent(Component):
+class JCLComponent(Component, object):
     """Implement default JCL component behavior:
     - regular interval behavior
     - Jabber register process (add, delete, update accounts)
@@ -66,21 +66,6 @@ class JCLComponent(Component):
 
     timeout = 1
 
-    def set_account_class(self, account_class):
-        """account_class attribut setter
-        create associated table via SQLObject"""
-        self.__account_class = account_class
-        self.db_connect()
-        self.__account_class.createTable() # TODO: ifNotExists = True)
-        self.db_disconnect()
-
-    def get_account_class(self):
-        """account_class attribut getter"""
-        return self.__account_class
-
-    account_class = property(get_account_class, set_account_class)
-
-
     def __init__(self,
                  jid,
                  secret,
@@ -101,7 +86,6 @@ class JCLComponent(Component):
         self.spool_dir = "."
         self.db_connection_str = db_connection_str
         self.__account_class = None
-        self.set_account_class(Account)
         self.version = VERSION
         self.accounts = []
         self.time_unit = 60
@@ -116,6 +100,22 @@ class JCLComponent(Component):
         signal.signal(signal.SIGINT, self.signal_handler)
         signal.signal(signal.SIGTERM, self.signal_handler)
 
+    def set_account_class(self, account_class):
+        """account_class attribut setter
+        create associated table via SQLObject"""
+        self.__account_class = account_class
+        self.db_connect()
+        self.__account_class.createTable(ifNotExists = True)
+        self.db_disconnect()
+
+    def get_account_class(self):
+        """account_class attribut getter"""
+        if self.__account_class is None:
+            self.set_account_class(Account)
+        return self.__account_class
+
+    account_class = property(get_account_class, set_account_class)
+
     def run(self):
         """Main loop
         Connect to Jabber server
@@ -591,8 +591,6 @@ class JCLComponent(Component):
     def get_reg_form(self, lang_class):
         """Return register form based on language and account class
         """
-        # TODO : handle text-private for password
-        # TODO : handle list-single
         reg_form = X()
         reg_form.xmlns = "jabber:x:data"
         reg_form.title = lang_class.register_title
@@ -604,7 +602,7 @@ class JCLComponent(Component):
                            label = lang_class.account_name, \
                            var = "name")
 
-        for (field, field_type) in \
+        for (field, field_type, post_func, default_func) in \
                 self.account_class.get_register_fields():
             lang_label_attr = self.account_class.__name__.lower() \
                               + "_" + field

src/jcl/jabber/x.py

@@ -113,7 +113,7 @@ class X(object):
         or return default func processing if field does not exist"""
         if self.fields.has_key(field_name):
             return post_func(self.fields[field_name].value)
-        return default_func()
+        return default_func(field_name)
         
     def attach_xml(self, info_query):
         """Attach this Xdata form to iq node

src/jcl/model/account.py

@@ -31,12 +31,15 @@ from sqlobject.col import StringCol, BoolCol
 from sqlobject.dbconnection import ConnectionHub
 
 from jcl.lang import Lang
+from jcl.jabber.error import FieldError
 
 OFFLINE = "offline"
 ONLINE = "online"
 
 # create a hub to attach a per thread connection
 hub = ConnectionHub()
+class Account2(SQLObject):
+    pass
 
 class Account(SQLObject):
     """Base Account class"""
@@ -90,7 +93,7 @@ class Account(SQLObject):
     status = property(get_status, set_status)
 
 
-    def get_register_fields(cls):
+    def _get_register_fields(cls):
         """Return a list of tuples for X Data Form composition
         A tuple is composed of:
         - field_name: might be the name of one of the class attribut
@@ -102,7 +105,7 @@ class Account(SQLObject):
         """
         return [] # "name" field is mandatory
     
-    get_register_fields = classmethod(get_register_fields)
+    get_register_fields = classmethod(_get_register_fields)
 
     def get_new_message_subject(self, lang_class):
         """Get localized message subject for new account"""
@@ -119,4 +122,26 @@ class Account(SQLObject):
     def get_update_message_body(self, lang_class):
         """Return localized message body for existing account"""
         return lang_class.new_account_message_body
+
+    def default_post_func(self, field_value):
+        """Default post process function: do nothing"""
+        return field_value
+
+    def boolean_post_func(self, field_value):
+        """Return a boolean from boolean field value"""
+        return (field_value == "1" or field_value.lower() == "true")
     
+    def int_post_func(self, field_value):
+        """Return an integer from integer field value"""
+        return int(field_value)
+
+    def string_not_null_post_func(self, field_value):
+        """Post process function for not null/empty string"""
+        if field_value is None or field_value == "":
+            raise FieldError # TODO : add translated message
+        return field_value
+
+    def mandatory_field(self, field_name):
+        """Used as default function for field that must be specified
+        and cannot have default value"""
+        raise FieldError # TODO : add translated message