Add support for rendering markdown with layout

Author: noteflakes

cmd/setup/template/site/site/_layout/default.rb

@@ -1,10 +1,11 @@
-export Papercraft.html { |**a|
-  html5 {
+export templ { |*a, **b|
+  html {
     head {
-      title "My awesome Syntropy website"
+      title 'My awesome Syntropy website'
+      link rel: 'stylesheet', type: 'text/css', href: '/assets/css/style.css'
     }
     body {
-      emit_yield **a
+      emit_yield(*a, **b)
     }
   }
 }

cmd/setup/template/site/site/about.md

@@ -0,0 +1,6 @@
+---
+layout: default
+---
+# About my site
+
+Lorem ipsum my awesome site.

cmd/setup/template/site/site/articles/cage.rb

@@ -1,31 +1,29 @@
 layout = import('_layout/default')
 
-poem_body = [
-  ['      in ten ', 'M', 'inutes']
-  ['                  ', 'C', 'ome back: you will']
-  ['have taught me chi', 'N', 'ese']
-  ['                (s', 'A', 'tie).']
-  ['       shall I ret', 'U', 'rn the favor?']
-  ['                  ', 'G', 'ive you']
-  ['                ot', 'H', 'er lessons']
-  ['                 (', 'T', 'ing!)?']
-  ['                  ', 'O', 'r would you prefer']
-  ['              sile', 'N', 'ce?']
+poem = [
+  "        in ten\xA0", 'M', 'inutes',
+  '                  ', 'C', 'ome back: you will',
+  'have taught me chi', 'N', 'ese',
+  '                (s', 'A', 'tie).',
+  '       shall I ret', 'U', 'rn the favor?',
+  '                  ', 'G', 'ive you',
+  '                ot', 'H', 'er lessons',
+  '                 (', 'T', 'ing!)?',
+  '                  ', 'O', 'r would you prefer',
+  '              sile', 'N', 'ce?',
 ]
 
-template = layout.apply {
-  article {
+export layout.apply {
+  article(class: 'mesostic') {
     h2 'For William McN. who studied with Ezra Pound'
 
-    line(_for: poem_body) { |l|
-      span(_for: l) { text it }
+    content {
+      span(_for: poem) { text it }
     }
 
     author {
-      span '-'
+      span "-\xA0"
       a 'John cage', href: 'https://en.wikipedia.org/wiki/John_Cage'
     }
   }
 }
-
-export template

cmd/setup/template/site/site/assets/css/style.css

@@ -0,0 +1,40 @@
+body {
+  font-family: sans-serif;
+}
+
+article.mesostic {
+  width: 600px;
+  margin: 2em auto;
+  font-size: 1.4em;
+
+  * {
+    font-family: monospace;
+  }
+
+  h2 {
+    text-align: center;
+  }
+
+  content {
+    display: grid;
+    margin: 2em 0;
+    grid-template-columns: 1fr auto 1fr;
+
+    span {
+      display: inline-block;
+    }
+    span:nth-child(3n + 1) {
+      text-align: right;
+    }
+
+    span:nth-child(3n + 2) {
+      text-align: center;
+      font-weight: bold;
+    }
+  }
+
+  author {
+    display: block;
+    text-align: right;
+  }
+}

cmd/setup/template/site/site/index.rb

@@ -0,0 +1,15 @@
+layout = import('_layout/default')
+
+export layout.apply {
+  h1 'Hello from Syntropy'
+  p {
+    span "Here's an "
+    a 'about', href: 'about'
+    span ' page.'
+  }
+  p {
+    span "Here's an "
+    a 'article', href: 'articles/cage'
+    span ' page.'
+  }
+}

lib/syntropy/app.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'qeweney'
 require 'json'
+require 'yaml'
+
+require 'qeweney'
 require 'papercraft'
 
 require 'syntropy/errors'
@@ -68,14 +70,15 @@ def start_file_watcher
     end
 
     def invalidate_cache(fn)
+      @module_loader.unload(fn)
+
       invalidated_keys = []
       @route_cache.each do |k, v|
         @opts[:logger]&.call("Invalidate cache for #{k}", nil)
         invalidated_keys << k if v[:fn] == fn
       end
 
       invalidated_keys.each { @route_cache.delete(it) }
-      @module_loader.unload(fn)
     end
 
     def calculate_relative_path_re(mount_path)
@@ -156,7 +159,7 @@ def render_entry(req, entry)
       when :static
         respond_static(req, entry)
       when :markdown
-        body = render_markdown(IO.read(entry[:fn]))
+        body = render_markdown(entry[:fn])
         req.respond(body, 'Content-Type' => 'text/html')
       when :module
         call_module(req, entry)
@@ -188,7 +191,7 @@ def load_module(entry)
       ref = entry[:fn].gsub(%r{^#{@src_path}/}, '').gsub(/\.rb$/, '')
       o = @module_loader.load(ref)
       o.is_a?(Papercraft::Template) ? wrap_template(o) : o
-    rescue StandardError => e
+    rescue Exception => e
       @opts[:logger]&.call("Error while loading module #{ref}: #{e.message}")
       :invalid
     end
@@ -200,8 +203,47 @@ def wrap_template(templ)
       }
     end
 
-    def render_markdown(str)
-      Papercraft.markdown(str)
+    def render_markdown(fn)
+      atts, md = parse_markdown_file(fn)
+
+      if atts[:layout]
+        layout = @module_loader.load("_layout/#{atts[:layout]}")
+        html = layout.apply { emit_markdown(md) }.render
+      else
+        html = Papercraft.markdown(md)
+      end
+      html
+    end
+
+    DATE_REGEXP = /(\d{4}\-\d{2}\-\d{2})/
+    FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+    YAML_OPTS = {
+      permitted_classes: [Date],
+      symbolize_names: true
+    }
+
+    # Parses the markdown file at the given path.
+    #
+    # @param path [String] file path
+    # @return [Array] an tuple containing properties<Hash>, contents<String>
+    def parse_markdown_file(path)
+      content = IO.read(path) || ''
+      atts = {}
+
+      # Parse date from file name
+      if (m = path.match(DATE_REGEXP))
+        atts[:date] ||= Date.parse(m[1])
+      end
+
+      if (m = content.match(FRONT_MATTER_REGEXP))
+        front_matter = m[1]
+        content = m.post_match
+
+        yaml = YAML.safe_load(front_matter, **YAML_OPTS)
+        atts = atts.merge(yaml)
+      end
+
+      [atts, content]
     end
   end
 end

lib/syntropy/module.rb

@@ -19,6 +19,7 @@ def unload(fn)
       ref = @fn_map[fn]
       return if !ref
 
+      p unload: ref, fn: fn
       @loaded.delete(ref)
       @fn_map.delete(fn)
     end
@@ -28,19 +29,22 @@ def unload(fn)
     def load_module(ref)
       fn = File.expand_path(File.join(@root, "#{ref}.rb"))
       @fn_map[fn] = ref
-      raise RuntimeError, "File not found #{fn}" if !File.file?(fn)
+      raise "File not found #{fn}" if !File.file?(fn)
 
       mod_body = IO.read(fn)
       mod_ctx = Class.new(Syntropy::Module)
       mod_ctx.loader = self
-      # mod_ctx = .new(self, @env)
       mod_ctx.module_eval(mod_body, fn, 1)
 
       export_value = mod_ctx.__export_value__
 
+      wrap_module(mod_ctx, export_value)
+    end
+
+    def wrap_module(mod_ctx, export_value)
       case export_value
       when nil
-        raise RuntimeError, 'No export found'
+        raise 'No export found'
       when Symbol
         # TODO: verify export_value denotes a valid method
         mod_ctx.new(@env)