Merge pull request #73 from appsembler/css

return CSS as dictionary

Author: OmarIthawi

setup.py

@@ -8,7 +8,7 @@ def read(fname):
 
 setup(
     name='site-configuration-client',
-    version='0.1.9',
+    version='0.1.10',
     description='Python client library for Site Configuration API',
     long_description=read('README.rst'),
     classifiers=[

site_config_client/openedx/adapter.py

@@ -42,20 +42,9 @@ def get_value_of_type(self, config_type, name, default):
         type_configs = all_configs[config_type]
         return type_configs.get(name, default)
 
-    def get_amc_v1_theme_css_variables(self):
+    def get_css_variables_dict(self):
         """
-        Returns an Open edX AMC v1 theme compatible sass variables.
-
-        Note: This function assumes that all variables are compatible with v1 theme.
+        Get a variable_name:value dictionary of CSS variables.
         """
         config = self.get_backend_configs()['configuration']
-
-        # Imitates the values in edX's SiteConfiguration sass_variables
-        openedx_theme_compatible_css_vars = [
-            # Note: The usual AMC produced format is key --> [value, default]
-            #       The second value is mostly unused by Open edX can be
-            #       set as [value, default].
-            [key, val]
-            for key, val in config[self.TYPE_CSS].items()
-        ]
-        return openedx_theme_compatible_css_vars
+        return config[self.TYPE_CSS]

tests/test_adapter.py

@@ -3,7 +3,6 @@
 """
 import pytest
 from unittest.mock import Mock
-from collections import OrderedDict
 
 
 CONFIGS = {
@@ -12,16 +11,11 @@
     },
     "status": "live",
     "configuration": {
-        "css": OrderedDict(
-            # Just like a normal dict, but makes tests less flaky
-            (
-                ("selected_font", ["lato", "lato"]),
-                ("text_color", ["#0a0a0a", "#0a0a0a"]),
-                ("header_logo_height", ["110", "110"]),
-                ("header_buttons_color", ["#164be0", "#164be0"]),
-                ("header_font_size", ["17", "17"]),
-            )
-        ),
+        "css": {
+            "selected_font": "lato",
+            "text_color": "#0a0a0a",
+            "header_logo_height": "110",
+        },
         "page": {
             "course-card": "course-tile-01",
             "privacy": {
@@ -70,15 +64,12 @@ def test_adapater(settings):
     assert setting_platform_name == CONFIGS['configuration']['setting']['PLATFORM_NAME']
     assert adapter.get_value_of_type('secret', 'SEGMENT_KEY', None) == 'so secret'
 
-    css_vars = adapter.get_amc_v1_theme_css_variables()
-    # This change is temporary til we migrate off AMC and its edx-customers-theme
-    assert css_vars == [
-        ["selected_font", ["lato", "lato"]],
-        ["text_color", ["#0a0a0a", "#0a0a0a"]],
-        ["header_logo_height", ["110", "110"]],
-        ["header_buttons_color", ["#164be0", "#164be0"]],
-        ["header_font_size", ["17", "17"]],
-    ], 'get_amc_v1_theme_css_variables should return AMC-like variables'
+    css_vars = adapter.get_css_variables_dict()
+    assert css_vars == {
+        "selected_font": "lato",
+        "text_color": "#0a0a0a",
+        "header_logo_height": "110",
+    }, 'get_css_variables_dict returns a dictionary of all variables'
 
     privacy_page_vars = adapter.get_value_of_type('page', 'privacy', None)
     assert privacy_page_vars == CONFIGS['configuration']['page']['privacy']