Merge pull request #21 from Klemek/dev

v1.2.7
Update package.json
2019-08-19 14:34:32 +02:00 · 2019-08-19 14:25:01 +02:00 · 2019-08-19 14:14:52 +02:00 · 2019-08-19 14:14:05 +02:00 · 2019-08-19 14:13:54 +02:00 · 2019-07-19 11:00:33 +02:00
15 changed files with 397 additions and 114 deletions
@@ -11,5 +11,6 @@ install:
 before_script:
  - npm install -g jshint
 script:
-  - jest --silent --coverage --coverageReporters=text-lcov | coveralls
+  - jest --coverage --silent
  - jshint ./src
+  - cat ./coverage/lcov.info | coveralls
@@ -1,9 +1,8 @@
-# GitBlog.md
-
-
 [![Build Status](https://img.shields.io/travis/Klemek/GitBlog.md.svg?branch=master)](https://travis-ci.org/Klemek/GitBlog.md)
 [![Coverage Status](https://img.shields.io/coveralls/github/Klemek/GitBlog.md.svg?branch=master)](https://coveralls.io/github/Klemek/GitBlog.md?branch=master)

+# GitBlog.md
+
 A static blog using Markdown pulled from your git repository.

 > Step 1 : ```$ vi 2019/06/21/index.md```  
@@ -245,6 +244,9 @@ Any URL like `/year/month/day/anything/` will redirect to this article (and link
  It allows you to add math equations to your articles by simply writing LaTeX between `$$` for full size (and between $ for inline) (more info [here](https://www.mathjax.org/))
 * **PlantUML**  
  It allows you to add UML diagrams with PlantUML Syntax between `@startuml` and `@enduml` (more info [here](http://www.plantuml.com))
+* **fa-diagrams**  
+  It allows you to define SVG diagrams with Font-Awesome icons in [TOML](https://github.com/toml-lang/toml) between `@startfad` and `@endfad` (more info [here](https://github.com/Klemek/fa-diagrams))
+

 ## Configuration
 [back to top](#gitblog-md)
@@ -273,6 +275,8 @@ Any URL like `/year/month/day/anything/` will redirect to this article (and link
     activate MathJax equations formatting
   * `plantuml` (default: true)  
     activate PlantUML diagram rendering
+   * `fa-diagrams` (default: true)  
+     activate fa-diagrams rendering
 * `home`
   * `title` (default: GitBlog.md)  
     the title of your blog, **strongly advised to be changed**  
@@ -1,6 +1,6 @@
 {
  "name": "gitblog.md",
-  "version": "1.0.3",
+  "version": "1.2.6",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -285,6 +285,11 @@
        }
      }
    },
+    "@iarna/toml": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz",
+      "integrity": "sha512-FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="
+    },
    "@jest/console": {
      "version": "24.7.1",
      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
@@ -2687,16 +2692,6 @@
        }
      }
    },
-    "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "requires": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
    "crypto": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
@@ -3011,20 +3006,6 @@
      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==",
      "dev": true
    },
-    "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
    "exit": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -3190,6 +3171,14 @@
      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
    },
+    "fa-diagrams": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fa-diagrams/-/fa-diagrams-1.0.3.tgz",
+      "integrity": "sha512-z9pFYYnc6s1sUs4lq+DY2m5ddLCKN3jdo5O6hv450WwjiQ7otk1RoGQsvpMcwSU1kMEzPJUI6AeTVvzyIElhwQ==",
+      "requires": {
+        "xml-js": "^1.6.11"
+      }
+    },
    "fast-deep-equal": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
@@ -3876,11 +3865,6 @@
      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-    },
    "get-value": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -4189,11 +4173,6 @@
        "loose-envify": "^1.0.0"
      }
    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
    "ipaddr.js": {
      "version": "1.9.0",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
@@ -6728,14 +6707,6 @@
      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
      "dev": true
    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
    "lcov-parse": {
      "version": "0.0.10",
      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz",
@@ -6784,9 +6755,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
    },
    "lodash.sortby": {
      "version": "4.7.0",
@@ -6895,14 +6866,6 @@
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
    "merge-descriptors": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -6976,11 +6939,6 @@
        "mime-db": "1.40.0"
      }
    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-    },
    "minimatch": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -7345,16 +7303,6 @@
      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
      "dev": true
    },
-    "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-      "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
-      }
-    },
    "os-tmpdir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -9777,6 +9725,14 @@
      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
    },
+    "xml-js": {
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
+      "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
+      "requires": {
+        "sax": "^1.2.4"
+      }
+    },
    "xml-name-validator": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
@@ -9809,6 +9765,73 @@
        "which-module": "^2.0.0",
        "y18n": "^3.2.1",
        "yargs-parser": "^8.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+        },
+        "invert-kv": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+          "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+        },
+        "lcid": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+          "requires": {
+            "invert-kv": "^1.0.0"
+          }
+        },
+        "mem": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "requires": {
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
+          }
+        }
      }
    },
    "yargs-parser": {
@@ -1,13 +1,15 @@
 {
  "name": "gitblog.md",
-  "version": "1.2.4",
+  "version": "1.2.7",
  "description": "A static blog using Markdown pulled from your git repository.",
  "main": "src/server.js",
  "dependencies": {
+    "@iarna/toml": "^2.2.3",
    "body-parser": "^1.19.0",
    "crypto": "^1.0.1",
    "ejs": "^2.6.2",
    "express": "^4.17.1",
+    "fa-diagrams": "^1.0.3",
    "mathjax-node": "^2.1.1",
    "ncp": "^2.0.0",
    "node-prismjs": "^0.1.2",
@@ -19,6 +19,7 @@ If you see this page, that means it's working
 * [Spoilers](#spoilers)
 * [Math Equations](#mathequations)
 * [UML](#uml)
+* [Diagrams](#diagrams)
 * [Youtube Videos](#youtubevideos)

 ### Headers
@@ -253,6 +254,34 @@ showdown -left-> express : 4. html
 express -up-> web : 5. html
@enduml

+### Diagrams
+[Back to top](#top)
+
+You can use [fa-diagrams](https://github.com/Klemek/fa-diagrams) with `@startfad` and `@endfad` tags and using [TOML](https://github.com/toml-lang/toml) inside
+
+@startfad
+[[nodes]]
+name = "node1"
+icon = "laptop-code"
+color = "#4E342E"
+bottom = "my app"
+
+[[nodes]]
+name = "node2"
+icon = "globe"
+color = "#455A64"
+bottom = "world"
+
+[[links]]
+from = "node1"
+to = "node2"
+color = "#333333"
+bottom = '"hello"'
+
+  [links.top]
+  icon = "envelope"
+@endfad
+
 ### Youtube Videos
 [Back to top](#top)

@@ -6,16 +6,18 @@
 </head>
 <body>
 <main>
-    <h1><%= info.title %></h1>
+    <h1 class="title"><%= info.title %></h1>
    <%= info.description %>
    <h2>Articles in this blog :</h2>
    <% articles.forEach((article) => { %>
        <div class="article">
-            <h3><%- `<a href="${article.url}">${article.title}</a>` %></h3>
-            <span class="time"><span>Published on</span> <%= article.year + '-' + article.month + '-' + article.day %></span>
+            <%- `<a href="${article.url}">` %>
+            <h3><%- `${article.title}` %></h3>
+            <span class="time"><span>Published on</span>&nbsp;&nbsp;<%= article.year + '-' + ('0' + article.month).slice(-2) + '-' + ('0' + article.day).slice(-2) %></span>
            <% if(article.thumbnail){ %>
                <%- `<img alt="thumbnail" src=${article.thumbnail}>` %>
            <% } %>
+            <%- `</a>` %>
        </div>
    <% }); %>
    <%- include('footer'); %>
@@ -16,7 +16,7 @@ body {
 }

 main {
-    max-width: 42rem;
+    max-width: 45rem;
    padding: 2rem;
    margin: auto;
    background-color: #F0F0F0;
@@ -54,6 +54,13 @@ pre {
    padding: 10px 16px;
 }

+:not(pre) > code {
+    padding: 0.25em 0.5em;
+    border-radius: 0.25em;
+    background: #DDD;
+    font-size: 90%;
+}
+
 blockquote {
    border-left: 0.5em solid #ccc;
    padding-left: 1em;
@@ -108,10 +115,11 @@ main.article div.header a.link-home {
    line-height: 2.4;
 }

-main.article div.header h1, main.article div.header h2 {
+main.article div.header h1, main.article div.header h2, .title {
    margin-top: 0.85em;
    margin-bottom: 0.25em;
    font-size: 2em;
+    font-weight: bold;
 }

 main.article div.header h1 a, main.article div.header h2 a, div.article h3 a {
@@ -129,6 +137,12 @@ div.article {
 div.article h3 {
    font-size: 1.3em;
    margin:0;
+    color: #3C3CA1;
+}
+
+div.article a {
+    text-decoration: none;
+    color: inherit;
 }

 div.article img{
@@ -138,6 +152,15 @@ div.article img{
    margin-top:0.25em;
 }

+div.article:hover {
+    opacity: 0.9;
+}
+
+div.article:active {
+    opacity: 0.8;
+}
+
+
 #text {
    text-align: justify;
    hyphens: auto;
@@ -147,7 +170,7 @@ div.article img{
    text-align: left;
 }

-#text img {
+#text img, #text svg {
    max-width: 100%;
    height: auto;
 }
@@ -9,7 +9,7 @@
    <div class="header">
        <a class="link-home" href="/">↑</a>
        <h1><%= article.title %></h1>
-        <span class="time"><span>Published on</span> <%= article.year + '-' + article.month + '-' + article.day %></span>
+        <span class="time"><span><%= article.draft ? 'Drafted on' : 'Published on' %></span>&nbsp;&nbsp;<%= article.year + '-' + ('0' + article.month).slice(-2) + '-' + ('0' + article.day).slice(-2) %></span>
    </div>
    <div id="text"><%- article.content %></div>
    <br>
@@ -69,8 +69,9 @@ module.exports = (config) => {
      Object.keys(articles).forEach((key) => delete articles[key]);
      Object.keys(dict).forEach((key) => articles[key] = dict[key]);
      const nb = Object.keys(articles).length;
+      const dnb = Object.values(articles).filter(a => a.draft).length;
      if (nb > 0)
-        console.log(cons.ok, `loaded ${nb} article${nb > 1 ? 's' : ''}`);
+        console.log(cons.ok, `loaded ${nb} article${nb > 1 ? 's' : ''} (${dnb} drafted)`);
      else
        console.log(cons.warn, `no articles loaded, check your configuration`);

@@ -220,7 +221,7 @@ module.exports = (config) => {
      if (!article)
        showError(req, res, 404);
      else {
-        renderer.render(path.join(article.realPath, config['article']['index']), (err, html) => {
+        renderer.render(article.realPath, (err, html) => {
          if (err) {
            console.log(cons.error, `failed to render article ${req.path} : ${err}`);
            return showError(req, res, 500);
@@ -10,7 +10,8 @@
    "webhook": true,
    "prism": true,
    "mathjax": true,
-    "plantuml": true
+    "plantuml": true,
+    "fa-diagrams": true
  },
  "home": {
    "title": "GitBlog.md",
@@ -82,7 +82,7 @@ module.exports = (config) => {
          const article = {
            path: joinUrl(p[0], p[1], p[2]),
            draft: p[3] === config['article']['draft'],
-            realPath: path.join(config['data_dir'], p[0], p[1], p[2]),
+            realPath: path.join(config['data_dir'], p[0], p[1], p[2], p[3]),
            year: parseInt(p[0]),
            month: parseInt(p[1]),
            day: parseInt(p[2])
@@ -90,7 +90,7 @@ module.exports = (config) => {
          article.date = new Date(article.year, article.month, article.day);
          article.date.setUTCHours(0);
          remaining++;
-          readIndexFile(path.join(article.realPath, p[3]), config['article']['thumbnail_tag'], (err, info) => {
+          readIndexFile(article.realPath, config['article']['thumbnail_tag'], (err, info) => {
            if (err)
              return cb(err);
            article.title = info.title || config['article']['default_title'];
@@ -5,6 +5,54 @@ const showdown = require('showdown');
 module.exports = (config) => {
  const converter = new showdown.Converter(config['showdown']);

+  /**
+   * get parts outside of codes/scripts
+   * @param {string} data
+   * @returns {{index:number, end:number, text:string}[]} parts
+   */
+  const getParts = (data) => {
+    let parts = [];
+    let match;
+    let i = 0;
+    while ((match = /```/m.exec(data.slice(i)))) {
+      parts.push({
+        index: i,
+        text: data.slice(i, i + match.index),
+      });
+      i += match.index + match[0].length;
+    }
+    if (i < data.length)
+      parts.push({
+        index: i,
+        text: data.slice(i, data.length),
+      });
+
+    parts = parts.filter((p, i) => i % 2 === 0); //filter out code parts
+
+    // detect scripts outside of code
+    parts.forEach((p, pi) => {
+      let i = 0;
+      const subParts = [];
+      while ((match = /(<script>((?:(?!<\/script>)[\s\S])*)<\/script>)/gm.exec(p.text.slice(i)))) {
+        subParts.push({
+          index: p.index + i,
+          text: p.text.slice(i, i + match.index),
+        });
+        i += match.index + match[0].length;
+      }
+      if (i < p.text.length)
+        subParts.push({
+          index: p.index + i,
+          text: p.text.slice(i, p.text.length),
+        });
+      parts.splice(pi, 1, ...subParts);
+    });
+
+    parts.forEach(part => part.end = part.index + part.text.length);
+
+    return parts;
+  };
+
  const renderShowDown = (data, cb) => {
    const html = converter.makeHtml(data);
    cb(html);
@@ -35,15 +83,19 @@ module.exports = (config) => {
  const renderPlantUML = (data, cb) => {
    if (!config['modules']['plantuml'])
      return cb(data);
+    const parts = getParts(data);
    const umlRegex = /@startuml\r?\n((?:(?!@enduml)[\s\S])*)\r?\n@enduml/m;
    let match;
-    while ((match = umlRegex.exec(data))) {
-      const code = match[1].trim();
-      const s = unescape(encodeURIComponent(code)); // jshint ignore:line
-      const compressed = global['zip_deflate'](s);
-      const url = `http://www.plantuml.com/plantuml/${config['plantuml']['output_format']}/${encode64(compressed)}`;// jshint ignore:line
-      data = data.slice(0, match.index) + `<img alt="generated PlantUML diagram" src="${url}">` + data.slice(match.index + match[0].length);
-    }
+    parts.forEach(part => {
+      while ((match = umlRegex.exec(part.text))) {
+        const code = match[1].trim();
+        const s = unescape(encodeURIComponent(code)); // jshint ignore:line
+        const compressed = global['zip_deflate'](s);
+        const url = `http://www.plantuml.com/plantuml/${config['plantuml']['output_format']}/${encode64(compressed)}`;// jshint ignore:line
+        part.text = part.text.slice(0, match.index) + `<img alt="generated PlantUML diagram" src="${url}">` + part.text.slice(match.index + match[0].length);
+      }
+      data = data.slice(0, part.index) + part.text + data.slice(part.end);
+    });
    cb(data);
  };

@@ -64,7 +116,9 @@ module.exports = (config) => {
    if (!config['modules']['mathjax'])
      return cb(data);

-    const doMJ = (match, format) => {
+    const parts = getParts(data);
+
+    const doMJ = (match, format, i) => {
      const eq = match[1].trim();
      const output = config['mathjax']['output_format'];
      const mjConf = {
@@ -74,7 +128,7 @@ module.exports = (config) => {
      };
      mjConf[output] = true;
      mjAPI.typeset(mjConf, (res) => {
-        data = data.slice(0, match.index) + res[output] + data.slice(match.index + match[0].length);
+        data = data.slice(0, parts[i].index + match.index) + res[output] + data.slice(parts[i].index + match.index + match[0].length);
        renderMathJax(data, (data2) => {
          cb(data2);
        });
@@ -84,31 +138,75 @@ module.exports = (config) => {
    const eqRegex = /\$\$((?:(?!\$\$)[\s\S])*)\$\$/m;
    const inlineEqRegex = /\$([^$\n]*)\$/;

-    let match;
-    if ((match = eqRegex.exec(data))) {
-      doMJ(match, 'TeX');
-    } else if ((match = inlineEqRegex.exec(data))) {
-      doMJ(match, 'inline-TeX');
-    } else {
-      cb(data);
+    for (let i = 0; i < parts.length; i++) {
+      let match;
+      if ((match = eqRegex.exec(parts[i].text))) {
+        return doMJ(match, 'TeX', i);
+      } else if ((match = inlineEqRegex.exec(parts[i].text))) {
+        return doMJ(match, 'inline-TeX', i);
+      }
    }
+    cb(data);
+  };
+
+  let faDiagrams;
+  let toml;
+  if (config['modules']['fa-diagrams']) {
+    faDiagrams = require('fa-diagrams');
+    toml = require('@iarna/toml');
+  }
+
+  const renderFaDiagrams = (data, cb) => {
+    if (!config['modules']['fa-diagrams'])
+      return cb(data);
+    const parts = getParts(data);
+    const diagramsRegex = /@startfad\r?\n((?:(?!@endfad)[\s\S])*)\r?\n@endfad/m;
+    let match;
+    parts.forEach(part => {
+      while ((match = diagramsRegex.exec(part.text))) {
+        const code = match[1].trim();
+        let output;
+        try {
+          const diagData = toml.parse(code);
+          const findLineBreaks = (data) => {
+            Object.keys(data).forEach(key => {
+              if (typeof data[key] === 'object')
+                findLineBreaks(data[key]);
+              else if (typeof data[key] === 'string')
+                data[key] = data[key].replace(/\\n/gm, '\n');
+            });
+          };
+          findLineBreaks(diagData);
+          output = faDiagrams.compute(diagData);
+        } catch (err) {
+          output = `<b style="color:red">${err.toString()}</b>`;
+        }
+        part.text = part.text.slice(0, match.index) + output + part.text.slice(match.index + match[0].length);
+      }
+      data = data.slice(0, part.index) + part.text + data.slice(part.end);
+    });
+    cb(data);
  };

  return {
+    getParts: config['test'] ? getParts : undefined,
    renderShowDown: config['test'] ? renderShowDown : undefined,
    renderPrism: config['test'] ? renderPrism : undefined,
    renderPlantUML: config['test'] ? renderPlantUML : undefined,
    renderMathJax: config['test'] ? renderMathJax : undefined,
+    renderFaDiagrams: config['test'] ? renderFaDiagrams : undefined,
    render: (file, cb) => {
      fs.readFile(file, {encoding: 'UTF-8'}, (err, data) => {
        if (err)
          return cb(err);

-        renderPrism(data, (data) => {
-          renderPlantUML(data, (data) => {
+        renderPlantUML(data, (data) => {
+          renderFaDiagrams(data, (data) => {
            renderMathJax(data, (data) => {
-              renderShowDown(data, (html) => {
-                cb(null, html);
+              renderPrism(data, (data) => {
+                renderShowDown(data, (html) => {
+                  cb(null, html);
+                });
              });
            });
          });
@@ -322,12 +322,11 @@ describe('Test articles rendering', () => {
    });
  });

-  test('500 no index', (done, fail) => {
+  test('500 fail to render', (done, fail) => {
    utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]);
    fs.writeFileSync(path.join(dataDir, '2019', '05', '05', 'index.md'), '# Hello');
-    fs.writeFileSync(path.join(dataDir, testTemplate), '<%- article.content %><%- `<a href="${article.url}">reload</a>` %>');
+    fs.writeFileSync(path.join(dataDir, testTemplate), '<%- articl.content %><%- `<a href="${article.url}">reload</a>` %>');
    app.reload(() => {
-      config['article']['index'] = 'invalid.md';
      request(app).get('/2019/05/05/hello/').then((response) => {
        expect(response.statusCode).toBe(500);
        done();
@@ -359,6 +358,19 @@ describe('Test articles rendering', () => {
    }, fail);
  });

+  test('200 rendered draft', (done, fail) => {
+    utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]);
+    fs.writeFileSync(path.join(dataDir, '2019', '05', '05', 'draft.md'), '# Hello');
+    fs.writeFileSync(path.join(dataDir, testTemplate), '<%- article.content %><%- `<a href="${article.url}">reload</a>` %>');
+    app.reload(() => {
+      request(app).get('/2019/05/05/hello/').then((response) => {
+        expect(response.statusCode).toBe(200);
+        expect(response.text).toBe('<h1 id="hello">Hello</h1><a href="/2019/05/05/hello/">reload</a>');
+        done();
+      });
+    }, fail);
+  });
+
  test('200 other url', (done, fail) => {
    utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]);
    utils.createEmptyFiles([
@@ -236,7 +236,7 @@ describe('Test article fetching', () => {
      expect(Object.keys(dict).length).toBe(1);
      expect(dict[joinUrl('2019', '05', '05')]).toEqual({
        path: joinUrl('2019', '05', '05'),
-        realPath: dir,
+        realPath: file,
        year: 2019,
        month: 5,
        draft: false,
@@ -267,7 +267,7 @@ describe('Test article fetching', () => {
      expect(Object.keys(dict).length).toBe(1);
      expect(dict[joinUrl('2019', '05', '05')]).toEqual({
        path: joinUrl('2019', '05', '05'),
-        realPath: dir,
+        realPath: file,
        year: 2019,
        month: 5,
        day: 5,
@@ -298,7 +298,7 @@ describe('Test article fetching', () => {
      expect(Object.keys(dict).length).toBe(1);
      expect(dict[joinUrl('2019', '05', '05')]).toEqual({
        path: joinUrl('2019', '05', '05'),
-        realPath: dir,
+        realPath: file,
        year: 2019,
        month: 5,
        day: 5,
@@ -326,7 +326,7 @@ describe('Test article fetching', () => {
      expect(Object.keys(dict).length).toBe(1);
      expect(dict[joinUrl('2019', '05', '05')]).toEqual({
        path: joinUrl('2019', '05', '05'),
-        realPath: dir,
+        realPath: file,
        year: 2019,
        month: 5,
        draft: false,
@@ -11,7 +11,8 @@ const config = {
  'modules': {
    'prism': true,
    'mathjax': true,
-    'plantuml': true
+    'plantuml': true,
+    'fa-diagrams': true,
  },
  'showdown': {
    'simplifiedAutoLink': true,
@@ -32,6 +33,7 @@ beforeEach(() => {
  config['modules']['prism'] = true;
  config['modules']['mathjax'] = true;
  config['modules']['plantuml'] = true;
+  config['modules']['fa-diagrams'] = true;
  utils.deleteFolderSync(dataDir);
  fs.mkdirSync(dataDir);
 });
@@ -42,6 +44,47 @@ afterAll(() => {
  }
 });

+describe('get parts', () => {
+  test('normal', () => {
+    const data = 'Hello\nthere\ngeneral\nkenobi';
+    const parts = renderer.getParts(data);
+    expect(parts.map(p => p.text)).toEqual([
+      'Hello\nthere\ngeneral\nkenobi'
+    ]);
+  });
+  test('lot of stuff', () => {
+    const data = 'Hello\nthere\n```code```\ngeneral<script>script</script>\n<script>script2</script>\n```<script>script3</script>```kenobi';
+    const parts = renderer.getParts(data);
+    expect(parts).toEqual([
+      {
+        index: 0,
+        end: 12,
+        text: 'Hello\nthere\n'
+      },
+      {
+        index: 22,
+        end: 30,
+        text: '\ngeneral'
+      },
+      {
+        index: 53,
+        end: 54,
+        text: '\n'
+      },
+      {
+        index: 78,
+        end: 79,
+        text: '\n'
+      },
+      {
+        index: 109,
+        end: 115,
+        text: 'kenobi'
+      },
+    ]);
+  });
+});
+
 describe('Test Showdown', () => {
  test('normal', (done) => {
    renderer.renderShowDown('# Hello', (html) => {
@@ -112,6 +155,13 @@ describe('Test PlantUML', () => {
    });
  });

+  test('plantuml ignored in code', (done) => {
+    renderer.renderPlantUML('code:\n```@startuml\nBob -> Alice : hello\n@enduml```\n ```@startuml``` @enduml', (data) => {
+      expect(data).toBe('code:\n```@startuml\nBob -> Alice : hello\n@enduml```\n ```@startuml``` @enduml');
+      done();
+    });
+  });
+
  test('plantuml multiple uml', (done) => {
    renderer.renderPlantUML('@startuml\nBob -> Alice : hello\n@enduml\n@startuml\nBob -> Alice : hello\n@enduml', (data) => {
      expect(data).toBe('<img alt="generated PlantUML diagram" src="http://www.plantuml.com/plantuml/svg/SyfFKj2rKt3CoKnELR1Io4ZDoSa70000">\n<img alt="generated PlantUML diagram" src="http://www.plantuml.com/plantuml/svg/SyfFKj2rKt3CoKnELR1Io4ZDoSa70000">');
@@ -157,6 +207,12 @@ describe('Test MathJax', () => {
      done();
    });
  });
+  test('no eq in code / script', (done) => {
+    renderer.renderMathJax('this code is ```start $a$ end $$hello$$``` beautiful <script>$A$</script>\n```$no eq$```', (data) => {
+      expect(data).toBe('this code is ```start $a$ end $$hello$$``` beautiful <script>$A$</script>\n```$no eq$```');
+      done();
+    });
+  });
  test('multiple eq', (done) => {
    renderer.renderMathJax('$$\n\nA\n\n$$\nstart $a$ end\n$$\n\nA\n\n$$', (data) => {
      expect(data).toBe('' +
@@ -182,6 +238,37 @@ describe('Test MathJax', () => {
  });
 });

+describe('Test fa-diagrams', () => {
+  test('no fa-diagrams', (done) => {
+    config['modules']['fa-diagrams'] = false;
+    renderer.renderFaDiagrams('@startfad\noptions.rendering.color=\'red\'\n@endfad', (data) => {
+      expect(data).toBe('@startfad\noptions.rendering.color=\'red\'\n@endfad');
+      done();
+    });
+  });
+  test('no fa-diagrams in code', (done) => {
+    renderer.renderFaDiagrams('code:\n```\n@startfad\noptions.rendering.color=\'red\'\n@endfad\n```', (data) => {
+      expect(data).toBe('code:\n```\n@startfad\noptions.rendering.color=\'red\'\n@endfad\n```');
+      done();
+    });
+  });
+  test('valid fa-diagrams', (done) => {
+    renderer.renderFaDiagrams('before\n@startfad\noptions.rendering.color=\'red\'\n@endfad\nafter', (data) => {
+      expect(data).toBe('before\n<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 0 0" width="0" height="0" font-family="Arial" font-size="15" fill="red" stroke-width="0"></svg>\nafter');
+      done();
+    });
+  });
+  test('invalid toml', (done) => {
+    renderer.renderFaDiagrams('before\n@startfad\noptions.rendering.color=red\n@endfad\nafter', (data) => {
+      expect(data).toBe('before\n<b style="color:red">TomlError: Unexpected character, expecting string, number, datetime, boolean, inline array or inline table at row 1, col 26, pos 25:\n' +
+        '1> options.rendering.color=red\n' +
+        '                            ^\n' +
+        '\n</b>\nafter');
+      done();
+    });
+  });
+});
+
 describe('Test render', () => {
  test('invalid file', (done) => {
    renderer.render('invalid file', (err, html) => {
Author	SHA1	Message	Date
Klemek	4671253147	Merge pull request #21 from Klemek/dev v1.2.7	2019-08-19 14:34:32 +02:00
Klemek	add01b28fe	Update package.json	2019-08-19 14:25:01 +02:00
Klemek	a27a53e238	faDiagram switch to TOML lang	2019-08-19 14:14:52 +02:00
Klemek	6aff9b4d93	Merge remote-tracking branch 'origin/dev' into dev	2019-08-19 14:14:05 +02:00
Klemek	c9f57233a4	faDiagram switch to TOML lang	2019-08-19 14:13:54 +02:00
Klemek	7d72e94aa3	Merge pull request #20 from Klemek/dev updated package-lock	2019-07-19 11:00:33 +02:00
Klemek	3d6a0b4306	Merge branch 'master' into dev	2019-07-19 10:58:52 +02:00
Klemek	babc533efc	updated package-lock	2019-07-19 10:56:26 +02:00
Klemek	36908134e6	Merge pull request #19 from Klemek/dependabot/npm_and_yarn/lodash-4.17.15 Bump lodash from 4.17.11 to 4.17.15	2019-07-19 10:50:53 +02:00
dependabot[bot]	d426b41368	Bump lodash from 4.17.11 to 4.17.15 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15) Signed-off-by: dependabot[bot] <support@github.com>	2019-07-19 08:48:39 +00:00
Klemek	1836a414eb	Merge pull request #18 from Klemek/dev v1.2.6	2019-07-19 10:46:33 +02:00
Klemek	ca49a29dd9	[skip CI] updated version	2019-07-19 10:44:58 +02:00
Klemek	02a768a6af	[skip CI] updated README.md	2019-07-19 10:44:26 +02:00
Klemek	bbc4d7c270	[skip CI] updated README.md	2019-07-19 10:42:25 +02:00
Klemek	bfa1521f85	updated sample to show fa-diagrams	2019-07-19 10:41:21 +02:00
Klemek	a05d380fcf	fixed parts detection	2019-07-19 10:41:01 +02:00
Klemek	4a32995ca1	fa-diagrams support	2019-07-19 10:19:12 +02:00
Klemek	53e1fe7201	mathjax/plantuml rendering only outside of code/scripts	2019-07-19 10:01:01 +02:00
Klemek	2e8ff1be92	fixed mathjax in code	2019-07-18 16:41:25 +02:00
Klemek	e14f9fc4af	Merge remote-tracking branch 'origin/dev' into dev	2019-07-18 14:07:34 +02:00
Klemek	896f302bcf	updated default template	2019-07-18 14:07:24 +02:00
Klemek	cc0bd1cf49	Merge pull request #17 from Klemek/dev updated CI	2019-07-12 14:07:36 +02:00
Klemek	7a1d9cbbd6	Merge branch 'master' into dev	2019-07-12 13:59:54 +02:00
Clément GOUIN	34e8d4cb6f	updated CI	2019-07-12 13:57:27 +02:00
Klemek	4a9b70ac68	Update .travis.yml	2019-07-12 13:53:55 +02:00
Klemek	889258c874	Update .travis.yml	2019-07-12 11:53:02 +02:00
Klemek	de26feb05c	Merge pull request #16 from Klemek/dev v1.2.5	2019-07-01 23:17:56 +02:00
Klemek	8bb455b576	Fixed draft rendering bug	2019-07-01 23:15:13 +02:00