Move from magic comments to magic elements

danott · Jan 15, 2024 · 5540e49 · 5540e49
1 parent e5018ac
commit 5540e49
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/lib/includable/page_defaults.rb b/lib/includable/page_defaults.rb
@@ -5,7 +5,7 @@ def initialize(string:, data:)
 
     def render
       <<~HTML
-        <!--IncludeInHeader::Text
+        <include-in-header>
           <meta name="viewport" content="width=device-width, initial-scale=1">
 
           <meta name="description" content="The personal website of Dan Ott.">
@@ -18,7 +18,7 @@ def render
           <link rel="alternate" type="application/rss+xml" href="/feed.xml" title="Dan Ott's RSS Feed">
 
           <script src="/javascripts/script.js"></script>
-        -->
+        </include-in-header>
       HTML
     end
   end

diff --git a/lib/magic_file.rb b/lib/magic_file.rb
@@ -13,11 +13,11 @@ def initialize(path, original_content)
 
   def content
     if path.match(%r{site/\d\d\d\d/})
-      [
-        "<!--Include::PageDefaults-->",
-        original_content,
-        "<!--Include::PostFooter-->"
-      ].join("\n\n")
+      <<~HTML
+        <eval-ruby>Includable::PageDefaults.new(string: nil, data: nil).render</eval-ruby>
+        #{original_content}
+        <eval-ruby>Includable::PostFooter.new(string: nil, data: self.data).render</eval-ruby>
+      HTML
     else
       original_content
     end

diff --git a/site/debug.md b/site/debug.md
@@ -2,4 +2,6 @@
 
 This is my page for debugging my build
 
-<!--Include::DataDump-->
+<eval-ruby>
+  Includable::DataDump.new(string: nil, data: Build.data).render
+</eval-ruby>
diff --git a/site/index.md b/site/index.md
@@ -1,4 +1,4 @@
-<!--Include::PageDefaults-->
+<eval-ruby>Includable::PageDefaults.new(string: nil, data: nil).render</eval-ruby>
 
 # 👨‍💻 danott.website
 
@@ -9,7 +9,6 @@ That's why I am hosting it at `danott.website`.
 You can subscribe to [Dan Ott's Website RSS Feed](/feed.xml).
 Here's a list of posts I've written in reverse chronological order.
 
-<!--Include::Index-->
 <eval-ruby>
-  Includable::Index.new(string: nil, data: Build.data)
+  Includable::Index.new(string: nil, data: Build.data).render
 </eval-ruby>
diff --git a/site/six-words.md b/site/six-words.md
@@ -1,4 +1,4 @@
-<!--Include::PageDefaults-->
+<eval-ruby>Includable::PageDefaults.new(string: nil, data: nil).render</eval-ruby>
 
 # Six Words
 
@@ -9,4 +9,6 @@ This habit offered consistency and constraints.
 I've decided to try it again.
 I'll share when I feel compelled.
 
-<!--Include::SixWords-->
+<eval-ruby>
+  Includable::SixWords.new(string: nil, data: Build.data).render
+</eval-ruby>
diff --git a/test/magic_file_test.rb b/test/magic_file_test.rb
@@ -12,6 +12,6 @@ def test_path_with_magic
     refute_equal content, magic_content
     assert_operator magic_content,
                     :starts_with?,
-                    "<!--Include::PageDefaults-->\n\n"
+                    "<eval-ruby>Includable::PageDefaults.new(string: nil, data: nil).render</eval-ruby>"
   end
 end