Move config hardcoded values out of classes

activitypub/manager/base.py

@@ -97,6 +97,10 @@ class Manager():
         self.defaults = defaults or self.make_defaults()
         self.defaults["$UUID"] = lambda: str(uuid.uuid4())
         self.database = database
+        self.config = {}
+        self._static_folder = os.path.abspath("./static")
+        self._template_folder = os.path.abspath("./templates")
+        self._sass_folder = os.path.abspath("./sass")
 
         def make_wrapper(manager, class_):
             def wrapper(*args, **kwargs):
@@ -130,7 +134,8 @@ class Manager():
         import sass
         THEME_STYLE = "light"
         THEME_COLOR = "#1d781d"
-        SASS_DIR = os.path.join(os.path.abspath(folder), "sass")
+        SASS_DIR = os.path.join(os.path.abspath(folder),
+                                self.get_sass_folder())
         theme_css = f"$primary-color: {THEME_COLOR};\n"
         with open(os.path.join(SASS_DIR, f"{THEME_STYLE}.scss")) as f:
             theme_css += f.read()
@@ -345,10 +350,22 @@ class Manager():
         return decorator
 
     def get_template_folder(self):
-        return "/home/dblank/activitypub/apps/blog/templates/"
+        return self._template_folder
+
+    def set_template_folder(self, value):
+        self._template_folder = os.path.abspath(value)
 
     def get_static_folder(self):
-        return "/home/dblank/activitypub/apps/blog/static"
+        return self._static_folder
+
+    def set_static_folder(self, value):
+        self._static_folder = value
+
+    def get_sass_folder(self):
+        return self._sass_folder
+
+    def set_sass_folder(self, value):
+        self._sass_folder = value
 
 ## Singleton for the Application
 ## Allows it to be in scope for decorating the app's

activitypub/manager/flaskman.py

@@ -30,16 +30,9 @@ class FlaskManager(Manager):
                          template_folder=self.get_template_folder(),
                          static_folder=self.get_static_folder())
         self.app.config.update(WTF_CSRF_CHECK_DEFAULT=False)
-        self.csrf = CSRFProtect(self.app)
-
-        #self.app.config["EXPLAIN_TEMPLATE_LOADING"] = True
-        self.app.config["ME"] = {"url": "https://example.com",
-                                 "icon": {"url": "https://example.com"},
-                                 "icon_url": 'https://cs.brynmawr.edu/~dblank/images/doug-sm-orig.jpg',
-                                 "summary": "I'm just me."}
         self.app.config["CSS"] = self.CSS
-        self.app.config["NAME"] =  "ActivityPub Blog"
-        self.app.config["ID"] = "http://localhost:5000"
+        self.app.config.update(self.config)
+        self.csrf = CSRFProtect(self.app)
         ## Add routes:
         for path, methods, f in app._data.routes:
             ## Add the route:

activitypub/manager/tornadoman.py

@@ -38,22 +38,12 @@ class TornadoManager(Manager):
 
     def render_template(self, name, **kwargs):
         filters = self.get_filters()
-        config = {}
-        config["ME"] = {"url": "https://example.com",
-                        "icon": {"url": "https://example.com"},
-                        "icon_url": 'https://cs.brynmawr.edu/~dblank/images/doug-sm-orig.jpg',
-                        "summary": "I'm just me."}
-        config["CSS"] = self.CSS
-        config["NAME"] =  "ActivityPub Blog"
-        config["ID"] = "http://localhost:5000"
-
         request = {"args": {}}
         session = {"logged_in": True}
-
         tornado.log.logging.warning("%s" % filters.keys())
         self.template_env.filters.update(filters)
         template = self.template_env.get_template(name)
-        return template.render(config=config,
+        return template.render(config=self.config,
                                request=request,
                                session=session,
                                **kwargs)