Refactor radar creation

radar/2016-02-01/languages-and-frameworks/react.md

@@ -1,6 +1,5 @@
 ---
-layout:     post
+title:      "React 123"
-title:      "React"
 ring:       adopt
 ---
 

radar/2016-02-01/methods-and-patterns/foo.md

@@ -1,7 +1,4 @@
 ---
-layout:     post
-title:      "Foo"
-ring:       trial
 new:        true
 ---
 

radar/2016-02-02/languages-and-frameworks/react.md

@@ -1,7 +1,6 @@
 ---
-layout:     post
 title:      "React"
-ring:       adopt
+ring:       trial
 ---
 
 Hier steht eine Einleitung über *React* - super "cool"

radar/2016-02-02/methods-and-patterns/foo.md

@@ -1,8 +1,6 @@
 ---
-layout:     post
 title:      "Foo"
 ring:       trial
-new:        true
 ---
 
 Foo

scripts/create.js

@@ -17,9 +17,9 @@ import {
 
 (async () => {
   try {
-    const tree = await getTree();
+    // const tree = await getTree();
     // console.log(JSON.stringify(tree, null, 2));
-    const radar = await createRadar(tree);
+    const radar = await createRadar();
     console.log(JSON.stringify(radar, null, 2));
   } catch(e) {
     console.error('error:', e);

scripts/radar.js

@@ -1,19 +1,25 @@
 import { walk } from 'walk';
-import fs, { readFileSync } from 'fs-extra';
+import fs, { readFile } from 'fs-extra';
 import path from 'path';
 import frontmatter from 'front-matter';
 import marked from 'marked';
-import waterfall from 'async/waterfall';
 import { srcPath } from './file';
 
-export const getTree = () => (
+export const createRadar = async (tree) => {
+  const fileNames = await getAllMarkdownFiles();
+  const revisions = await createRevisionsFromFiles(fileNames);
+  const quadrants = createQuadrants(revisions);
+  return quadrants;
+};
+
+const getAllMarkdownFiles = () => (
   new Promise((resolve, reject) => {
     const walker = walk(srcPath(), { followLinks: false });
-    let radar = {};
+    const files = [];
 
     walker.on("file", (root, fileStat, next) => {
       if (isMarkdownFile(fileStat.name)) {
-        radar = addItemToRadar(radar, path.resolve(root, fileStat.name))
+        files.push(path.resolve(root, fileStat.name));
       }
       next();
     });
@@ -27,115 +33,75 @@ export const getTree = () => (
     });
 
     walker.on("end", () => {
-      resolve(radar);
+      resolve(files.sort().reverse());
     });
   })
 );
 
 const isMarkdownFile = (name) => name.match(/\.md$/);
 
-const addItemToRadar = (radar, pathName) => {
+const createRevisionsFromFiles = (fileNames) => (
-  const item = createItemFromPath(pathName);
+  Promise.all(fileNames.map((fileName) => {
-  return {
+    return new Promise((resolve, reject) => {
-    ...radar,
+      readFile(fileName, 'utf8', (err, data) => {
-    [item.version]: addItemToVersion(radar[item.version] || {}, item),
+        if(err) {
+          reject(err);
+        } else {
+          const fm = frontmatter(data);
+          resolve({
+            ...itemInfoFromFilename(fileName),
+            fileName,
+            attributes: fm.attributes,
+            body: fm.body,
+          });
         }
-};
+      });
+    })
+  }))
+)
 
-const addItemToVersion = (version, item) => {
+const itemInfoFromFilename = (fileName) => {
-  return {
+  const [
-    ...version,
-    [item.quadrant]: addItemToQuadrant(version[item.quadrant] || {}, item),
-  };
-};
-
-const addItemToQuadrant = (quadrant, item) => {
-  return {
-    ...quadrant,
-    [item.name]: item.path,
-  };
-};
-
-const createItemFromPath = (pathName) => {
-  const [version, quadrant, fileName] = pathName.split('/').slice(-3);
-  return {
     version,
     quadrant,
-    path: pathName,
+    nameWithSuffix,
-    name: fileName.substr(0, fileName.length - 3),
+  ] = fileName.split('/').slice(-3);
-  };
-};
-
-export const createRadar = async (tree) => {
-  const versionNames = Object.keys(tree).sort();
-  const radar = versionNames.reduce((radar, versionName) => {
-    return updateRadarWithVersion(radar, versionName, tree);
-  }, {});
-
-  return readItemsDataFromFiles(radar);
-};
-
-const updateRadarWithVersion = (radar, versionName, tree) => {
-  const version = tree[versionName];
-  const quadrantNames = Object.keys(version);
-  return quadrantNames.reduce((updatedRadar, quadrantName) => {
   return {
-      ...updatedRadar,
+    name: nameWithSuffix.substr(0, nameWithSuffix.length - 3),
-      [quadrantName]: updateQuadrantWithVersion(updatedRadar[quadrantName] || {}, quadrantName, versionName, tree),
+    version,
+    quadrant,
   }
-  }, radar);
 };
 
-const updateQuadrantWithVersion = (quadrant, quadrantName, versionName, tree) => {
+const createQuadrants = (revisions) => (
-  const quadrantInNewVersion = tree[versionName][quadrantName];
+  revisions.reduce((quadrants, revision) => {
-  const fileNames = Object.keys(quadrantInNewVersion);
-  return fileNames.reduce((updatedQuadrant, fileName) => {
     return {
-      ...updatedQuadrant,
+      ...quadrants,
-      [fileName]: updateItemWithVersion(updatedQuadrant[fileName], fileName, quadrantName, versionName, tree),
+      [revision.quadrant]: addRevisionToQuadrant(quadrants[revision.quadrant], revision),
-    }
-  }, quadrant);
-};
-
-const updateItemWithVersion = (file = { revision: 0, files: [] }, fileName, quadrantName, versionName, tree) => {
-  const fileInNewVersion = tree[versionName][quadrantName][fileName];
-  return {
-    files: file.files.concat([{
-      version: versionName,
-      file: fileInNewVersion,
-    }]),
     };
-};
+  }, {})
+);
 
-const readItemsDataFromFiles = (radar) => {
+const addRevisionToQuadrant = (quadrant = {}, revision) => ({
-  return Object.entries(radar).reduce((newRadar, [quadrantName, quadrant]) => {
+  ...quadrant,
+  [revision.name]: addRevisionToItem(quadrant[revision.name], revision),
+});
+
+const addRevisionToItem = (item = {
+  attributes: {},
+  revisions: [],
+}, revision) => {
+  const {
+    name,
+    quadrant,
+    fileName,
+    ...rest,
+  } = revision;
   return {
-      ...newRadar,
+    attributes: {
-      [quadrantName]: Object.entries(quadrant).reduce((newQuadrant, [itemName, item]) => {
+      ...item.attributes,
-        return {
+      ...revision.attributes,
-          ...newQuadrant,
-          [itemName]: {
-            revisions: item.files.length,
-            data: mergeDataFromFiles(item.files)
     },
+    revisions: item.revisions.concat(rest),
   };
-      }, {}),
-    }
-  }, {});
-};
-
-const mergeDataFromFiles = (files) => {
-  const frontmatters = getFrontmatterForAllFiles(files);
-  console.log()
-  return frontmatters;
-};
-
-const getFrontmatterForAllFiles = (files) => {
-  return files.map(({ file }) => {
-    return getFrontmatter(file);
-  })
-};
-
-const getFrontmatter = (fileName) => {
-  return frontmatter(readFileSync(fileName, 'utf8'));
 };