Merging the experimental branch back to trunk.

[osqa.git] / forum / settings / base.py

diff --git a/forum/settings/base.py b/forum/settings/base.py
index 4987bc07d2901a610fc384a4798cb3215c5d7a41..5bcf5fc51a6d929c6c82209c15ca2a3b1d22e9a9 100644 (file)
--- a/forum/settings/base.py
+++ b/forum/settings/base.py
@@ -2,17 +2,38 @@ import django.dispatch
 from django.utils.encoding import force_unicode
 
 class SettingSet(list):
 from django.utils.encoding import force_unicode
 
 class SettingSet(list):

-    def __init__(self, name, title, description, weight=1000):
+    def __init__(self, name, title, description, weight=1000, markdown=False):

         self.name = name
         self.title = title
         self.description = description
         self.weight = weight
         self.name = name
         self.title = title
         self.description = description
         self.weight = weight

+        self.markdown = markdown
+        

 
 class BaseSetting(object):
 
 class BaseSetting(object):

-    def __init__(self, name, default, field_context):
+    @classmethod
+    def add_to_class(cls, name):
+        def wrapper(self, *args, **kwargs):
+            return self.value.__getattribute__(name)(*args, **kwargs)
+
+        setattr(cls, name, wrapper)
+
+    def __init__(self, name, default, set=None, field_context=None):

         self.name = name
         self.default = default
         self.name = name
         self.default = default

-        self.field_context = field_context
+        self.field_context = field_context or {}
+
+        if set is not None:
+            if not set.name in Setting.sets:
+                Setting.sets[set.name] = set
+
+            Setting.sets[set.name].append(self)
+
+    def __str__(self):
+        return str(self.value)
+
+    def __unicode__(self):
+        return unicode(self.value)

 
     @property
     def value(self):
 
     @property
     def value(self):


@@ -28,112 +49,44 @@ class BaseSetting(object):
 
     def set_value(self, new_value):
         new_value = self._parse(new_value)
 
     def set_value(self, new_value):
         new_value = self._parse(new_value)

+        self.save(new_value)
+
+    def save(self, value):

         from forum.models import KeyValue
 
         try:
             kv = KeyValue.objects.get(key=self.name)
         from forum.models import KeyValue
 
         try:
             kv = KeyValue.objects.get(key=self.name)

-            old_value = kv.value

         except:
             kv = KeyValue(key=self.name)
         except:
             kv = KeyValue(key=self.name)

-            old_value = self.default

 
 

-        kv.value = new_value
+        kv.value = value

         kv.save()
 
         kv.save()
 

-        setting_update.send(sender=self, old_value=old_value, new_value=new_value)
-

     def to_default(self):
         self.set_value(self.default)
 
     def _parse(self, value):
         return value
 
     def to_default(self):
         self.set_value(self.default)
 
     def _parse(self, value):
         return value
 

-    def __str__(self):
-        return str(self.value)
-
-    def __unicode__(self):
-        return unicode(self.value)
-
-    def __nonzero__(self):
-        return bool(self.value)
-
-
-class StringSetting(BaseSetting):
-    def _parse(self, value):
-        if isinstance(value, unicode):
-            return value.encode('utf8')
-        else:
-            return str(value)
-
-    def __unicode__(self):
-        return unicode(self.value.decode('utf8'))
-
-    def __add__(self, other):
-        return "%s%s" % (unicode(self), other)
-
-    def __cmp__(self, other):
-        return cmp(str(self), str(other))
-
-class IntegerSetting(BaseSetting):
-    def _parse(self, value):
-        return int(value)
-
-    def __int__(self):
-        return int(self.value)
-
-    def __add__(self, other):
-        return int(self) + int(other)
-
-    def __sub__(self, other):
-        return int(self) - int(other)
-
-    def __cmp__(self, other):
-        return int(self) - int(other)
-
-class FloatSetting(BaseSetting):
-    def _parse(self, value):
-        return float(value)
-
-    def __int__(self):
-        return int(self.value)
-
-    def __float__(self):
-        return float(self.value)
-
-    def __add__(self, other):
-        return float(self) + float(other)
-
-    def __sub__(self, other):
-        return float(self) - float(other)
-
-    def __cmp__(self, other):
-        return float(self) - float(other)
-
-class BoolSetting(BaseSetting):
-    def _parse(self, value):
-        return bool(value)

 
 class Setting(object):
 
 class Setting(object):

+    emulators = {}

     sets = {}
 
     sets = {}
 

-    def __new__(cls, name, default, set=None, field_context={}):
-        if isinstance(default, bool):
-            instance = BoolSetting(name, default, field_context)
-        elif isinstance(default, str):
-            instance = StringSetting(name, default, field_context)
-        elif isinstance(default, float):
-            instance = FloatSetting(name, default, field_context)
-        elif isinstance(default, int):
-            instance = IntegerSetting(name, default, field_context)
+    def __new__(cls, name, default, set=None, field_context=None):
+        deftype = type(default)
+
+        if deftype in Setting.emulators:
+            emul = Setting.emulators[deftype]

         else:
         else:

-            instance = BaseSetting(name, default, field_context)
+            emul = type(deftype.__name__ + cls.__name__, (BaseSetting,), {})
+            fns = [n for n, f in [(p, getattr(deftype, p)) for p in dir(deftype) if not p in dir(cls)] if callable(f)]

 
 

-        if set is not None:
-            if not set.name in cls.sets:
-                cls.sets[set.name] = set
+            for n in fns:
+               emul.add_to_class(n)
+
+            Setting.emulators[deftype] = emul

 
 

-            cls.sets[set.name].append(instance)
+        return emul(name, default, set, field_context)

 
 

-        return instance

 
 

-setting_update = django.dispatch.Signal(providing_args=['old_value', 'new_value'])