Allow config file to be specified

Currently via environment variable, but for now that's fine as the
only use that I can forsee is for testing, where the plumbing is more
important than the interface.

Alan Pearce alan@alanpearce.eu

Sun, 08 Oct 2017 11:18:37 +0200

commit

6fcfcc550921ab43c00d323c172fd9d04211e53d

parent

529946dc5bdccc2153c97e2040953047319480f4

4 files changed, 18 insertions(+), 18 deletions(-)

jump to

src/app.js
src/index.js
src/modules/config.js
test/app.test.js

M src/app.js → src/app.js

@@ -8,23 +8,21 @@ const actions = require("./actions.js");
 const responders = require("./responders.js");
 
-const config = require("./modules/config.js");
-
 const Router = require("koa-router");
 const router = new Router();
 
 const makeTagURI = (authority, startDate) => specific =>
   `tag:${authority},${startDate}:${specific}`;
 
-app.context.makeTagURI = makeTagURI(
-  config.feed.originalDomainName,
-  config.feed.domainStartDate
-);
-app.context.getURL = router.url.bind(router);
-
-module.exports = async function() {
+module.exports = async function(config) {
   const Posts = await require("./domain/posts.js")(config.posts, basename =>
     router.url("post", basename)
+  );
+
+  app.context.getURL = router.url.bind(router);
+  app.context.makeTagURI = makeTagURI(
+    config.feed.originalDomainName,
+    config.feed.domainStartDate
   );
 
   router.get("home", "/", actions.home(config, responders.home, Posts.posts));

M src/index.js → src/index.js

@@ -1,7 +1,8 @@ "use strict";
 
-const config = require("./modules/config.js");
+const getConfig = require("./modules/config.js");
 
+const CONFIG_FILE = process.env.CONFIG_FILE || undefined;
 const PORT = process.env.PORT || config.server.port;
 const targetDir = process.argv[2];
 
@@ -13,7 +14,7 @@ const app = require("./app.js"); 
 (async function() {
   try {
-    (await app()).listen(PORT, () => {
+    (await app(getConfig(CONFIG_FILE))).listen(PORT, () => {
       console.log(`App listening on port ${PORT}`);
     });
   } catch (error) {

M src/modules/config.js → src/modules/config.js

@@ -4,11 +4,12 @@ const path = require("path"); const TOML = require("toml");
 const config = require("configly");
 
-module.exports = config(
-  ["./config", path.resolve(__dirname, "../../config/")],
-  {
+function getConfig(configFile = "./config") {
+  return config(["./config", path.resolve(__dirname, "../../config/")], {
     parsers: {
       toml: TOML.parse
     }
-  }
-);
+  });
+}
+
+module.exports = getConfig;

M test/app.test.js → test/app.test.js

@@ -7,11 +7,11 @@ const cheerio = require("cheerio"); const mf = require("microformat-node");
 
 process.chdir(path.resolve(__dirname, "./testsite/"));
-const config = require(path.resolve(__dirname, "../src/modules/config.js"));
+const getConfig = require(path.resolve(__dirname, "../src/modules/config.js"));
 
 const App = require("../src/app.js");
 let app;
-test.before(async t => (app = await App()));
+test.before(async t => (app = await App(getConfig("./testsite/config.toml"))));
 
 const parseResponse = res =>
   cheerio.load(res.text, {

all repos — archive/homestead @ 6fcfcc550921ab43c00d323c172fd9d04211e53d

My future indieweb platform