Changeset 578:c249d8fce092

Timestamp:

30/04/12 14:23:25 (13 months ago)

Author:

Santiago Piccinini (SAn) <piccinini.santiago@…>

Branch:

multisite

Message:

Refactored out replace_settings function of multisite middleware and added tests

Location:

cyclope

Files:

• core/multisite/middleware.py (modified) (2 diffs)
• tests.py (modified) (2 diffs)

cyclope/core/multisite/middleware.py

@@ -59 +59 @@
 
         admin.autodiscover()
-        for setting_name in dir(site_settings):
-            if setting_name == setting_name.upper():
-                old_value = getattr(settings, setting_name, None)
-                new_value = getattr(site_settings, setting_name)
 
-                # this is a dynamic setting
-                if issubclass(type(old_value), DynamicSetting):
-                    # the current site did not override the default
-                    if issubclass(type(new_value), DynamicSetting):
-                        old_value.set(getattr(default_settings, setting_name))
-                    else:
-                        old_value.set(new_value)
-                else:
-                    setattr(settings, setting_name, new_value)
-
+        replace_settings(settings, site_settings)
         cyc_settings.reload_settings()
 
@@ -86 +73 @@
             patch_vary_headers(response, ('Host',))
         return response
+
+def replace_settings(old_settings, new_settings):
+    """
+    Updates old_settings values with new_settings's using DynamicSettings.
+    """
+    for setting_name in dir(new_settings):
+        if setting_name == setting_name.upper():
+            old_value = getattr(old_settings, setting_name, None)
+            new_value = getattr(new_settings, setting_name)
+
+            # this is a dynamic setting
+            if issubclass(type(old_value), DynamicSetting):
+                # the current site did not override the default
+                if issubclass(type(new_value), DynamicSetting):
+                    old_value.set(getattr(default_settings, setting_name))
+                else:
+                    old_value.set(new_value)
+            else:
+                setattr(old_settings, setting_name, new_value)
+

cyclope/tests.py

@@ -44 +44 @@
 from cyclope.sitemaps import CollectionSitemap, CategorySitemap, MenuSitemap
 from cyclope.core.multisite.threadlocals import DynamicSetting
+from cyclope.core.multisite.middleware import replace_settings
 
 
@@ -533 +534 @@
         self.assertEqual(float(self.ds), 1.0)
 
+class DynamicSettingsMiddlewareTestCase(TestCase):
+
+    def test_replace_settings(self):
+
+        class Setting(object): pass
+        settings_a = Setting()
+        settings_a.FOO = 3
+
+        settings_new = Setting()
+        settings_new.FOO = 5
+
+        replace_settings(settings_a, settings_new)
+        self.assertTrue(isinstance(settings_a.FOO, int))
+        self.assertEqual(int(settings_a.FOO), 5)
+
+        settings_a.FOO = DynamicSetting("FOO")
+        settings_a.FOO.set(3)
+        settings_new.FOO = 5
+        replace_settings(settings_a, settings_new)
+        self.assertTrue(isinstance(settings_a.FOO, DynamicSetting))
+        self.assertEqual(int(settings_a.FOO), 5)
+
+
+
+