feat: add basic h-card to homepage header

Alan Pearce alan@alanpearce.eu

Fri, 30 Jun 2017 21:34:30 +0200

commit

d3dfbb13b7037c9382bd8418e475ac4208216f39

parent

7d0ca01038f1a31af38ddf7b156da688f62f2f00

4 files changed, 40 insertions(+), 11 deletions(-)

jump to

config/default.toml
src/responders.js
src/templates/layout.html
test/app.test.js

M config/default.toml → config/default.toml

@@ -2,7 +2,7 @@ [server] port = 3000
 
 [site]
-title = "Test Site"
+author = "John Doe"
 
 [posts]
 folder = "./posts"

M src/responders.js → src/responders.js

@@ -80,7 +80,7 @@ .outer("main", showPage("home"))         .inner(".posts", function(postsTemplate) {
           return postsStream.pipe(postsTemplate.map(renderPostListItem(ctx)));
         })
-        .pipe(setTitle(config.site.title))
+        .pipe(setTitle(config.site.author))
         .render()
     );
   },
@@ -94,7 +94,7 @@ .pipe(rheo())         .outer("main", showPage("post"))
         .inner("article h1", rheo(post.data.get("title")))
         .outer("article main", rheo(post.body))
-        .pipe(setTitle(config.site.title, post.data.get("title")))
+        .pipe(setTitle(config.site.author, post.data.get("title")))
         .render()
     );
   },
@@ -106,11 +106,11 @@ templates         .layout()
         .pipe(rheo())
         .outer("main", showPage("taxon"))
-        .inner("h1", rheo(config.site.title))
+        .inner("h1", rheo(config.site.author))
         .inner(".posts", function(postsTemplate) {
           return taxonItems.pipe(postsTemplate.map(renderPostListItem(ctx)));
         })
-        .pipe(setTitle(config.site.title))
+        .pipe(setTitle(config.site.author))
         .render()
     );
   }

M src/templates/layout.html → src/templates/layout.html

@@ -5,8 +5,8 @@ <meta charset="utf-8"/>     <title></title>
   </head>
   <body>
-    <header>
-      <h1>hello world</h1>
+    <header class="h-card">
+      <h1 class="p-name">hello world</h1>
     </header>
     <main></main>
   </body>

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

@@ -1,7 +1,10 @@+"use strict";
+
 const test = require("ava");
 const path = require("path");
 const request = require("supertest");
 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"));
@@ -14,6 +17,11 @@ normalizeWhitespace: true,     useHtmlParser2: true
   });
 
+const toMicroformatsOptions = node => ({
+  node,
+  textFormat: "normalised"
+});
+
 test("homepage", t => {
   return request(app.listen())
     .get("/")
@@ -21,10 +29,31 @@ .expect(200)     .expect(/^<!DOCTYPE html>/)
     .then(parseResponse)
     .then($ => {
-      t.is($("head > title").text(), config.site.title);
-      t.is($("h1").text(), config.site.title);
+      t.is($("head > title").text(), "John Doe");
+      t.is($("h1").text(), "John Doe");
       t.is($("main").length, 1);
-    });
+      return $;
+    })
+    .then(toMicroformatsOptions)
+    .then(options =>
+      Promise.all([
+        mf.countAsync(options).then(count =>
+          t.deepEqual(count, {
+            "h-card": 1
+          })
+        ),
+        mf.getAsync(options).then(data => {
+          t.deepEqual(data.items, [
+            {
+              properties: {
+                name: ["John Doe"]
+              },
+              type: ["h-card"]
+            }
+          ]);
+        })
+      ])
+    );
 });
 
 test("post", t => {
@@ -34,7 +63,7 @@ .expect(200)     .expect(/^<!DOCTYPE html>/)
     .then(parseResponse)
     .then($ => {
-      t.is($("head > title").text(), "This is a test · " + config.site.title);
+      t.is($("head > title").text(), "This is a test · " + "John Doe");
       t.is($("article h1").text(), "This is a test");
       t.is(
         $("article p").text(),

all repos — archive/homestead @ d3dfbb13b7037c9382bd8418e475ac4208216f39

My future indieweb platform