From 34d9cd52b0926261320a5a2ea8dbf8bf99b8806c Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Sat, 11 Feb 2023 11:24:14 +0100
Subject: [PATCH 01/36] Templates/Parts now have access to an EmbeddableText
 object.

---
 buildSrc/src/main/groovy/ssg.lib.gradle       |  3 +
 .../ssg/SimpleStaticSiteGenerator.groovy      | 21 ++---
 .../ssg/part/EmbeddablePart.groovy            | 12 ++-
 .../ssg/part/EmbeddablePartsMap.groovy        | 16 +++-
 .../ssg/part/GspPartRenderer.groovy           | 20 ++++-
 .../jessebrault/ssg/part/PartRenderer.groovy  | 11 ++-
 .../ssg/template/GspTemplateRenderer.groovy   | 14 ++--
 .../ssg/template/TemplateRenderer.groovy      |  6 +-
 ...StaticSiteGeneratorIntegrationTests.groovy |  4 +-
 .../ssg/part/GspPartRendererTests.groovy      | 41 +++++++++-
 .../GspSpecialPageRendererTests.groovy        | 26 ++++---
 .../template/GspTemplateRendererTests.groovy  | 76 ++++++++++++++++---
 12 files changed, 197 insertions(+), 53 deletions(-)

diff --git a/buildSrc/src/main/groovy/ssg.lib.gradle b/buildSrc/src/main/groovy/ssg.lib.gradle
index 443abeb..78f61fa 100644
--- a/buildSrc/src/main/groovy/ssg.lib.gradle
+++ b/buildSrc/src/main/groovy/ssg.lib.gradle
@@ -7,6 +7,9 @@ repositories {
 }
 
 dependencies {
+    // https://mvnrepository.com/artifact/org.jetbrains/annotations
+    api 'org.jetbrains:annotations:24.0.0'
+
     /**
      * Logging
      */
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
index f2dd9cf..04504ed 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
@@ -69,21 +69,14 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
             logger.debug('found template: {}', template)
 
-            // Render the text (i.e., transform text to html)
-            def textRenderResult = it.type.renderer.render(it, globals)
-            String renderedText
-            if (textRenderResult.v1.size() > 0) {
-                logger.debug('diagnostics for rendering {}: {}', it.path, textRenderResult.v1)
-                diagnostics.addAll(textRenderResult.v1)
-                logger.trace(exit, '')
-                return
-            } else {
-                renderedText = textRenderResult.v2
-                logger.debug('renderedText: {}', renderedText)
-            }
-
             // Render the template using the result of rendering the text earlier
-            def templateRenderResult = template.type.renderer.render(template, frontMatter, renderedText, parts, globals)
+            def templateRenderResult = template.type.renderer.render(
+                    template,
+                    frontMatter,
+                    it,
+                    parts,
+                    globals
+            )
             String renderedTemplate
             if (templateRenderResult.v1.size() > 0) {
                 diagnostics.addAll(templateRenderResult.v1)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
index 9e7d1ab..ceeb31b 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
@@ -1,8 +1,10 @@
 package com.jessebrault.ssg.part
 
+import com.jessebrault.ssg.text.EmbeddableText
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
+import org.jetbrains.annotations.Nullable
 
 @TupleConstructor(includeFields = true, defaults = false)
 @NullCheck
@@ -13,8 +15,16 @@ class EmbeddablePart {
     private final Map globals
     private final Closure onDiagnostics
 
+    @Nullable
+    private final EmbeddableText text
+
     String render(Map binding = [:]) {
-        def result = part.type.renderer.render(this.part, binding, this.globals)
+        def result = part.type.renderer.render(
+                this.part,
+                binding,
+                this.globals,
+                this.text
+        )
         if (result.v1.size() > 0) {
             this.onDiagnostics.call(result.v1)
             ''
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
index 0db363b..5473bdc 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
@@ -1,18 +1,26 @@
 package com.jessebrault.ssg.part
 
+import com.jessebrault.ssg.text.EmbeddableText
 import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
+import org.jetbrains.annotations.Nullable
 
-@NullCheck
 @EqualsAndHashCode(includeFields = true)
 class EmbeddablePartsMap {
 
     @Delegate
     private final Map<String, EmbeddablePart> partsMap = [:]
 
-    EmbeddablePartsMap(Collection<Part> parts, Map globals, Closure onDiagnostics) {
+    EmbeddablePartsMap(
+            Collection<Part> parts,
+            Map globals,
+            Closure onDiagnostics,
+            @Nullable EmbeddableText text = null
+    ) {
+        Objects.requireNonNull(parts)
+        Objects.requireNonNull(globals)
+        Objects.requireNonNull(onDiagnostics)
         parts.each {
-            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics))
+            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index c1f783e..84e7812 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -1,9 +1,11 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.text.EmbeddableText
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
+import org.jetbrains.annotations.Nullable
 
 @EqualsAndHashCode
 class GspPartRenderer implements PartRenderer {
@@ -11,15 +13,27 @@ class GspPartRenderer implements PartRenderer {
     private static final TemplateEngine engine = new GStringTemplateEngine()
 
     @Override
-    Tuple2<Collection<Diagnostic>, String> render(Part part, Map binding, Map globals) {
+    Tuple2<Collection<Diagnostic>, String> render(
+            Part part,
+            Map binding,
+            Map globals,
+            @Nullable EmbeddableText text = null
+    ) {
+        Objects.requireNonNull(part)
+        Objects.requireNonNull(binding)
+        Objects.requireNonNull(globals)
         try {
             def result = engine.createTemplate(part.text).make([
                     binding: binding,
-                    globals: globals
+                    globals: globals,
+                    text: text
             ])
             new Tuple2<>([], result.toString())
         } catch (Exception e) {
-            new Tuple2<>([new Diagnostic("An exception occurred while rendering part ${ part.path }:\n${ e }", e)], '')
+            new Tuple2<>(
+                    [new Diagnostic("An exception occurred while rendering part ${ part.path }:\n${ e }", e)],
+                    ''
+            )
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
index 7675fdd..2995b19 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
@@ -1,7 +1,16 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.text.EmbeddableText
+import org.jetbrains.annotations.Nullable
 
 interface PartRenderer {
-    Tuple2<Collection<Diagnostic>, String> render(Part part, Map binding, Map globals)
+
+    Tuple2<Collection<Diagnostic>, String> render(
+            Part part,
+            Map binding,
+            Map globals,
+            @Nullable EmbeddableText text
+    )
+
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index ec538b6..fc91f9d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -3,7 +3,9 @@ package com.jessebrault.ssg.template
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.part.EmbeddablePartsMap
 import com.jessebrault.ssg.part.Part
+import com.jessebrault.ssg.text.EmbeddableText
 import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.text.Text
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
@@ -19,19 +21,21 @@ class GspTemplateRenderer implements TemplateRenderer {
     Tuple2<Collection<Diagnostic>, String> render(
             Template template,
             FrontMatter frontMatter,
-            String text,
+            Text text,
             Collection<Part> parts,
             Map globals
     ) {
         try {
             Collection<Diagnostic> diagnostics = []
+            def onDiagnostics = { Collection<Diagnostic> partDiagnostics ->
+                diagnostics.addAll(partDiagnostics)
+            }
+            def embeddableText = new EmbeddableText(text, globals, onDiagnostics)
             def result = engine.createTemplate(template.text).make([
                     frontMatter: frontMatter,
                     globals: globals,
-                    parts: new EmbeddablePartsMap(parts, globals, { Collection<Diagnostic> partDiagnostics ->
-                        diagnostics.addAll(partDiagnostics)
-                    }),
-                    text: text
+                    parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText),
+                    text: embeddableText
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
index 71e2b5a..62d2021 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
@@ -3,13 +3,17 @@ package com.jessebrault.ssg.template
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.text.Text
 
 interface TemplateRenderer {
 
+    /**
+     * TODO: get rid of frontMatter param since we can obtain it from the text
+     */
     Tuple2<Collection<Diagnostic>, String> render(
             Template template,
             FrontMatter frontMatter,
-            String text,
+            Text text,
             Collection<Part> parts,
             Map globals
     )
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
index dee6973..4ca52bc 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
@@ -61,7 +61,7 @@ class SimpleStaticSiteGeneratorIntegrationTests {
     @Test
     void simple() {
         new File(this.textsDir, 'test.md').write('---\ntemplate: test.gsp\n---\n**Hello, World!**')
-        new File(this.templatesDir, 'test.gsp').write('<%= text %>')
+        new File(this.templatesDir, 'test.gsp').write('<%= text.render() %>')
 
         def result = this.ssg.generate(this.build)
 
@@ -81,7 +81,7 @@ class SimpleStaticSiteGeneratorIntegrationTests {
             }
         }
 
-        new File(this.templatesDir, 'nested.gsp').write('<%= text %>')
+        new File(this.templatesDir, 'nested.gsp').write('<%= text.render() %>')
 
         def result = this.ssg.generate(this.build)
 
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index d905341..724b329 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -1,18 +1,34 @@
 package com.jessebrault.ssg.part
 
+import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.text.*
 import org.junit.jupiter.api.Test
 
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
+import static org.mockito.ArgumentMatchers.any
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.when
 
 class GspPartRendererTests {
 
+    /**
+     * TODO: move to a fixture
+     */
+    private static Text mockRenderableText(String text) {
+        def textRenderer = mock(TextRenderer)
+        when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
+        def frontMatterGetter = mock(FrontMatterGetter)
+        def excerptGetter = mock(ExcerptGetter)
+        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+    }
+
     private final PartRenderer renderer = new GspPartRenderer()
 
     @Test
     void rendersWithNoBindingOrGlobals() {
         def part = new Part('', null, 'Hello, World!')
-        def r = this.renderer.render(part, [:], [:])
+        def r = this.renderer.render(part, [:], [:], null)
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -20,7 +36,7 @@ class GspPartRendererTests {
     @Test
     void rendersWithBinding() {
         def part = new Part('', null, "<%= binding['greeting'] %>")
-        def r = this.renderer.render(part, [greeting: 'Hello, World!'], [:])
+        def r = this.renderer.render(part, [greeting: 'Hello, World!'], [:], null)
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -28,9 +44,28 @@ class GspPartRendererTests {
     @Test
     void rendersWithGlobals() {
         def part = new Part(null, null, "<%= globals['greeting'] %>")
-        def r = this.renderer.render(part, [:], [greeting: 'Hello, World!'])
+        def r = this.renderer.render(part, [:], [greeting: 'Hello, World!'], null)
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
 
+    @Test
+    void textAvailable() {
+        def part = new Part('', null, '<%= text.render() %>')
+        def textDiagnostics = []
+        def r = this.renderer.render(
+                part,
+                [:],
+                [:],
+                new EmbeddableText(
+                        mockRenderableText('Hello, World!'),
+                        [:],
+                        { Collection<Diagnostic> diagnostics -> textDiagnostics.addAll(diagnostics) }
+                )
+        )
+        assertTrue(textDiagnostics.isEmpty())
+        assertTrue(r.v1.isEmpty())
+        assertEquals('Hello, World!', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index 15c3b20..d949a37 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -3,11 +3,7 @@ package com.jessebrault.ssg.specialpage
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.part.PartRenderer
 import com.jessebrault.ssg.part.PartType
-import com.jessebrault.ssg.text.FrontMatterGetter
-import com.jessebrault.ssg.text.MarkdownExcerptGetter
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.text.TextRenderer
-import com.jessebrault.ssg.text.TextType
+import com.jessebrault.ssg.text.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
@@ -35,7 +31,7 @@ class GspSpecialPageRendererTests {
 
     @Test
     void rendersPartWithNoBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(any(), any(), any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(any(), any(), any(), any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType , '')
 
@@ -47,11 +43,16 @@ class GspSpecialPageRendererTests {
 
     @Test
     void rendersPartWithBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(any(), argThat { Map m -> m.get('greeting') == 'Hello, World!'}, any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(any(), argThat { Map m -> m.get('greeting') == 'Hello, World!'}, any(), any()))
+                .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, '')
 
-        def specialPage = new SpecialPage("<%= parts['test'].render([greeting: 'Hello, World!'])", null, null)
+        def specialPage = new SpecialPage(
+                "<%= parts['test'].render([greeting: 'Hello, World!'])",
+                null,
+                null
+        )
         def r = this.renderer.render(specialPage, [], [part], [:])
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
@@ -59,11 +60,16 @@ class GspSpecialPageRendererTests {
 
     @Test
     void rendersText(@Mock TextRenderer textRenderer, @Mock FrontMatterGetter frontMatterGetter) {
-        when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], '<p><strong>Hello, World!</strong></p>\n'))
+        when(textRenderer.render(any(), any()))
+                .thenReturn(new Tuple2<>([], '<p><strong>Hello, World!</strong></p>\n'))
         def textType = new TextType([], textRenderer, frontMatterGetter, new MarkdownExcerptGetter())
         def text = new Text('', 'test', textType)
 
-        def specialPage = new SpecialPage("<%= texts.find { it.path == 'test' }.render() %>", null, null)
+        def specialPage = new SpecialPage(
+                "<%= texts.find { it.path == 'test' }.render() %>",
+                null,
+                null
+        )
         def r = this.renderer.render(specialPage, [text], [], [:])
         assertTrue(r.v1.size() == 0)
         assertEquals('<p><strong>Hello, World!</strong></p>\n', r.v2)
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index 8fac879..d0c6470 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -3,7 +3,12 @@ package com.jessebrault.ssg.template
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.part.PartRenderer
 import com.jessebrault.ssg.part.PartType
+import com.jessebrault.ssg.text.ExcerptGetter
 import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.text.FrontMatterGetter
+import com.jessebrault.ssg.text.Text
+import com.jessebrault.ssg.text.TextRenderer
+import com.jessebrault.ssg.text.TextType
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
@@ -13,11 +18,33 @@ import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
 import static org.mockito.ArgumentMatchers.any
 import static org.mockito.ArgumentMatchers.argThat
+import static org.mockito.Mockito.mock
 import static org.mockito.Mockito.when
 
 @ExtendWith(MockitoExtension)
 class GspTemplateRendererTests {
 
+    /**
+     * TODO: move to a fixture
+     */
+    private static Text mockBlankText() {
+        def textRenderer = mock(TextRenderer)
+        def frontMatterGetter = mock(FrontMatterGetter)
+        def excerptGetter = mock(ExcerptGetter)
+        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+    }
+
+    /**
+     * TODO: move to a fixture
+     */
+    private static Text mockRenderableText(String text) {
+        def textRenderer = mock(TextRenderer)
+        when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
+        def frontMatterGetter = mock(FrontMatterGetter)
+        def excerptGetter = mock(ExcerptGetter)
+        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+    }
+
     private final TemplateRenderer renderer = new GspTemplateRenderer()
 
     @Test
@@ -28,11 +55,17 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), any(), any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(any(), any(), any(), any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, null)
 
-        def r = this.renderer.render(template, new FrontMatter(null, [:]), '', [part], [:])
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                mockBlankText(),
+                [part],
+                [:]
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -45,11 +78,18 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), argThat { Map m -> m.get('person') == 'World' }, any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(any(), argThat { Map m -> m.get('person') == 'World' }, any(), any()))
+                .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('greeting', partType, null)
 
-        def r = this.renderer.render(template, new FrontMatter(null, [:]), '', [part], [:])
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                mockBlankText(),
+                [part],
+                [:]
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -57,7 +97,13 @@ class GspTemplateRendererTests {
     @Test
     void rendersFrontMatter() {
         def template = new Template("<%= frontMatter['title'] %>", null, null)
-        def r = this.renderer.render(template, new FrontMatter(null, [title: ['Hello!']]), '', [], [:])
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [title: ['Hello!']]),
+                mockBlankText(),
+                [],
+                [:]
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello!', r.v2)
     }
@@ -65,15 +111,27 @@ class GspTemplateRendererTests {
     @Test
     void rendersGlobal() {
         def template = new Template("<%= globals['test'] %>", null, null)
-        def r = this.renderer.render(template, new FrontMatter(null, [:]), '', [], [test: 'Hello, World!'])
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                mockBlankText(),
+                [],
+                [test: 'Hello, World!']
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
 
     @Test
-    void rendersText() {
-        def template = new Template('<%= text %>', null, null)
-        def r = this.renderer.render(template, new FrontMatter(null, [:]), 'Hello, World!', [], [:])
+    void textAvailableToRender() {
+        def template = new Template('<%= text.render() %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                mockRenderableText('Hello, World!'),
+                [],
+                [:]
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }

From 936587d0b58d41bda09d04ddeee762950b899a37 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Sun, 12 Feb 2023 16:17:24 +0100
Subject: [PATCH 02/36] TagBuilder implemented and available in templates,
 parts, and specialPages.

---
 .../ssg/part/GspPartRenderer.groovy           |  2 +
 .../specialpage/GspSpecialPageRenderer.groovy |  2 +
 .../ssg/tagbuilder/DynamicTagBuilder.groovy   | 77 +++++++++++++++++++
 .../ssg/tagbuilder/TagBuilder.groovy          |  8 ++
 .../ssg/template/GspTemplateRenderer.groovy   |  2 +
 .../ssg/part/GspPartRendererTests.groovy      |  8 ++
 .../GspSpecialPageRendererTests.groovy        |  8 ++
 .../ssg/tagbuilder/TagBuilderTests.groovy     | 54 +++++++++++++
 .../template/GspTemplateRendererTests.groovy  | 14 ++++
 9 files changed, 175 insertions(+)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/TagBuilder.groovy
 create mode 100644 lib/src/test/groovy/com/jessebrault/ssg/tagbuilder/TagBuilderTests.groovy

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index 84e7812..33ec3fb 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableText
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
@@ -26,6 +27,7 @@ class GspPartRenderer implements PartRenderer {
             def result = engine.createTemplate(part.text).make([
                     binding: binding,
                     globals: globals,
+                    tagBuilder: new DynamicTagBuilder(),
                     text: text
             ])
             new Tuple2<>([], result.toString())
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index cadb675..6810e24 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -3,6 +3,7 @@ package com.jessebrault.ssg.specialpage
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.part.EmbeddablePartsMap
+import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableTextsCollection
 import com.jessebrault.ssg.text.Text
 import groovy.text.GStringTemplateEngine
@@ -25,6 +26,7 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
                     parts: new EmbeddablePartsMap(parts, globals, { Collection<Diagnostic> partDiagnostics ->
                         diagnostics.addAll(partDiagnostics)
                     }),
+                    tagBuilder: new DynamicTagBuilder(),
                     texts: new EmbeddableTextsCollection(texts, globals, { Collection<Diagnostic> textDiagnostics ->
                         diagnostics.addAll(textDiagnostics)
                     })
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy
new file mode 100644
index 0000000..9acb4d0
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy
@@ -0,0 +1,77 @@
+package com.jessebrault.ssg.tagbuilder
+
+import org.codehaus.groovy.runtime.InvokerHelper
+
+class DynamicTagBuilder implements TagBuilder {
+
+    @Override
+    String create(String name) {
+        "<$name />"
+    }
+
+    @Override
+    String create(String name, Map<String, ?> attributes) {
+        def formattedAttributes = attributes.collect {
+            if (it.value instanceof String) {
+                it.key + '="' + it.value + '"'
+            } else if (it.value instanceof Integer) {
+                it.key + '=' + it.value
+            } else if (it.value instanceof Boolean && it.value == true) {
+                it.key
+            } else {
+                it.key + '="' + it.value.toString() + '"'
+            }
+        }.join(' ')
+        "<$name $formattedAttributes />"
+    }
+
+    @Override
+    String create(String name, String body) {
+        "<$name>$body</$name>"
+    }
+
+    @Override
+    String create(String name, Map<String, ?> attributes, String body) {
+        def formattedAttributes = attributes.collect {
+            if (it.value instanceof String) {
+                it.key + '="' + it.value + '"'
+            } else if (it.value instanceof Integer) {
+                it.key + '=' + it.value
+            } else if (it.value instanceof Boolean && it.value == true) {
+                it.key
+            } else {
+                it.key + '="' + it.value.toString() + '"'
+            }
+        }.join(' ')
+        "<$name $formattedAttributes>$body</$name>"
+    }
+
+    @Override
+    Object invokeMethod(String name, Object args) {
+        def argsList = InvokerHelper.asList(args)
+        return switch (argsList.size()) {
+            case 0 -> this.create(name)
+            case 1 -> {
+                def arg0 = argsList[0]
+                if (arg0 instanceof Map) {
+                    this.create(name, arg0)
+                } else if (arg0 instanceof String) {
+                    this.create(name, arg0)
+                } else {
+                    throw new MissingMethodException(name, this.class, args, false)
+                }
+            }
+            case 2 -> {
+                def arg0 = argsList[0]
+                def arg1 = argsList[1]
+                if (arg0 instanceof Map && arg1 instanceof String) {
+                    this.create(name, arg0, arg1)
+                } else {
+                    throw new MissingMethodException(name, this.class, args, false)
+                }
+            }
+            default -> throw new MissingMethodException(name, this.class, args, false)
+        }
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/TagBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/TagBuilder.groovy
new file mode 100644
index 0000000..a92c64a
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/TagBuilder.groovy
@@ -0,0 +1,8 @@
+package com.jessebrault.ssg.tagbuilder
+
+interface TagBuilder {
+    String create(String name)
+    String create(String name, Map<String, ?> attributes)
+    String create(String name, String body)
+    String create(String name, Map<String, ?> attributes, String body)
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index fc91f9d..9ad0842 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -3,6 +3,7 @@ package com.jessebrault.ssg.template
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.part.EmbeddablePartsMap
 import com.jessebrault.ssg.part.Part
+import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableText
 import com.jessebrault.ssg.text.FrontMatter
 import com.jessebrault.ssg.text.Text
@@ -35,6 +36,7 @@ class GspTemplateRenderer implements TemplateRenderer {
                     frontMatter: frontMatter,
                     globals: globals,
                     parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText),
+                    tagBuilder: new DynamicTagBuilder(),
                     text: embeddableText
             ])
             new Tuple2<>(diagnostics, result.toString())
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index 724b329..b759e59 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -68,4 +68,12 @@ class GspPartRendererTests {
         assertEquals('Hello, World!', r.v2)
     }
 
+    @Test
+    void tagBuilderAvailable() {
+        def part = new Part('', null, '<%= tagBuilder.test() %>')
+        def r = this.renderer.render(part, [:], [:], null)
+        assertTrue(r.v1.isEmpty())
+        assertEquals('<test />', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index d949a37..df0a597 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -75,4 +75,12 @@ class GspSpecialPageRendererTests {
         assertEquals('<p><strong>Hello, World!</strong></p>\n', r.v2)
     }
 
+    @Test
+    void tagBuilderAvailable() {
+        def specialPage = new SpecialPage('<%= tagBuilder.test() %>', null, null)
+        def r = this.renderer.render(specialPage, [], [], [:])
+        assertTrue(r.v1.isEmpty())
+        assertEquals('<test />', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/tagbuilder/TagBuilderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/tagbuilder/TagBuilderTests.groovy
new file mode 100644
index 0000000..e598822
--- /dev/null
+++ b/lib/src/test/groovy/com/jessebrault/ssg/tagbuilder/TagBuilderTests.groovy
@@ -0,0 +1,54 @@
+package com.jessebrault.ssg.tagbuilder
+
+import org.junit.jupiter.api.Test
+
+import static org.junit.jupiter.api.Assertions.assertEquals
+
+class TagBuilderTests {
+
+    private final TagBuilder tagBuilder = new DynamicTagBuilder()
+
+    @Test
+    void simple() {
+        assertEquals('<test />', this.tagBuilder.create('test'))
+    }
+
+    @Test
+    void withAttributes() {
+        assertEquals('<test test="abc" />', this.tagBuilder.create('test', [test: 'abc']))
+    }
+
+    @Test
+    void withBody() {
+        assertEquals('<test>test</test>', this.tagBuilder.create('test', 'test'))
+    }
+
+    @Test
+    void withAttributesAndBody() {
+        assertEquals(
+                '<test test="abc">test</test>',
+                this.tagBuilder.create('test', [test: 'abc'], 'test')
+        )
+    }
+
+    @Test
+    void dynamicSimple() {
+        assertEquals('<test />', this.tagBuilder.test())
+    }
+
+    @Test
+    void dynamicWithAttributes() {
+        assertEquals('<test test="abc" />', this.tagBuilder.test([test: 'abc']))
+    }
+
+    @Test
+    void dynamicWithBody() {
+        assertEquals('<test>test</test>', this.tagBuilder.test('test'))
+    }
+
+    @Test
+    void dynamicWithAttributesAndBody() {
+        assertEquals('<test test="abc">test</test>', this.tagBuilder.test([test: 'abc'], 'test'))
+    }
+
+}
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index d0c6470..50684a7 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -136,4 +136,18 @@ class GspTemplateRendererTests {
         assertEquals('Hello, World!', r.v2)
     }
 
+    @Test
+    void tagBuilderAvailable() {
+        def template = new Template('<%= tagBuilder.test() %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                mockBlankText(),
+                [],
+                [:]
+        )
+        assertTrue(r.v1.isEmpty())
+        assertEquals('<test />', r.v2)
+    }
+
 }

From c608be5d9a2fda57fda8e628a55a05eeacf0c9ae Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Mon, 13 Feb 2023 13:45:27 +0100
Subject: [PATCH 03/36] Created CHANGELOG.md.

---
 CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..9f17ced
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,33 @@
+# Changelog
+
+All notable changes to SSG will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to 
+[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Next/Unreleased
+
+### Added
+
+- A `tagBuilder` of type `DynamicTagBuilder` is available in Templates, SpecialPages, and Parts.
+    ```groovy
+    def simpleTag = tagBuilder.test()
+    assert simpleTag == '<test />'
+  
+    def tagWithBody = tagBuilder.title 'Hello, World!'
+    assert tagWithBody == '<title>Hello, World!</title>'
+    
+    def tagWithAttributes = tagBuilder.meta name: 'og:title', content: 'Hello, World!'
+    assert tagWithAttributes == '<meta name="og:title" content="Hello, World!" />'
+  
+    def tagWithAttributesAndBody = tagBuilder.p([id: 'my-paragraph'], 'Hello, World!')
+    assert tagWithAttributesAndBody == '<p id="my-paragraph">Hello, World!</p>'
+    ```
+  This is likely most useful for building simple, one-line html/xml tags. 
+  [93687d](https://github.com/JesseBrault0709/ssg/commit/936587d).
+- **Breaking**: the `text` object in Templates is now an instance of `EmbeddableText` instead of `String`. Thus, one must
+  use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
+- Parts have a `text` object of type `EmbeddableText`. If we are rendering a part called from anything other than a Template
+  (which has an associated text), this will be `null`. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
+
+### Fixed

From 0b57ec827c70de89499e0a8f66427f93f23095bf Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Mon, 13 Feb 2023 13:56:14 +0100
Subject: [PATCH 04/36] Update CHANGELOG.md

---
 CHANGELOG.md | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f17ced..2ffabf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,14 @@
 
 All notable changes to SSG will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to 
-[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Next/Unreleased
+## Next
 
 ### Added
 
-- A `tagBuilder` of type `DynamicTagBuilder` is available in Templates, SpecialPages, and Parts.
+- A `tagBuilder` object of type [`DynamicTagBuilder`](lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy) is available in Templates, SpecialPages, and Parts.
+
     ```groovy
     def simpleTag = tagBuilder.test()
     assert simpleTag == '<test />'
@@ -23,11 +23,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
     def tagWithAttributesAndBody = tagBuilder.p([id: 'my-paragraph'], 'Hello, World!')
     assert tagWithAttributesAndBody == '<p id="my-paragraph">Hello, World!</p>'
     ```
-  This is likely most useful for building simple, one-line html/xml tags. 
-  [93687d](https://github.com/JesseBrault0709/ssg/commit/936587d).
-- **Breaking**: the `text` object in Templates is now an instance of `EmbeddableText` instead of `String`. Thus, one must
-  use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
-- Parts have a `text` object of type `EmbeddableText`. If we are rendering a part called from anything other than a Template
-  (which has an associated text), this will be `null`. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
+    
+  This is likely most useful for building simple, one-line html/xml tags. [93687d](https://github.com/JesseBrault0709/ssg/commit/936587d).
+- Parts have a `text` object of type [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy). If one is rendering a Part called from anything other than a Template (which has an associated text), this will be `null`. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
 
-### Fixed
+### Changed
+- **Breaking**: the `text` object in Templates is now an instance of [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy) instead of `String`. Thus, one must use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
+
+### Deprecated
+- The `frontMatter` object in Templates is now deprecated. Use `text.frontMatter` instead.

From eafc8cd336a5c4de81e8a966e23b46edc318b146 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Mon, 13 Feb 2023 14:00:48 +0100
Subject: [PATCH 05/36] Deprecated frontMatter parameter in TemplateRenderer.

---
 .../com/jessebrault/ssg/template/GspTemplateRenderer.groovy      | 1 +
 .../groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index 9ad0842..0e01342 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -21,6 +21,7 @@ class GspTemplateRenderer implements TemplateRenderer {
     @Override
     Tuple2<Collection<Diagnostic>, String> render(
             Template template,
+            @Deprecated
             FrontMatter frontMatter,
             Text text,
             Collection<Part> parts,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
index 62d2021..15f23ad 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
@@ -12,6 +12,7 @@ interface TemplateRenderer {
      */
     Tuple2<Collection<Diagnostic>, String> render(
             Template template,
+            @Deprecated
             FrontMatter frontMatter,
             Text text,
             Collection<Part> parts,

From e470b0ba909a812dac874b233795d0c2fd90ed26 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Mon, 13 Feb 2023 14:06:55 +0100
Subject: [PATCH 06/36] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ffabf0..f009e91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,4 +31,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - **Breaking**: the `text` object in Templates is now an instance of [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy) instead of `String`. Thus, one must use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
 
 ### Deprecated
-- The `frontMatter` object in Templates is now deprecated. Use `text.frontMatter` instead.
+- The `frontMatter` object in Templates is now deprecated. Use `text.frontMatter` instead. [eafc8cd](https://github.com/JesseBrault0709/ssg/commit/eafc8cd).

From 25f4b3657d8e92cff99c97e84f6c8aa656494d16 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Mon, 13 Feb 2023 15:08:03 +0100
Subject: [PATCH 07/36] Refactored ssg.common to include everything, in
 preparation of text fixtures.

---
 buildSrc/src/main/groovy/ssg.common.gradle | 33 ++++++++++++++++++--
 buildSrc/src/main/groovy/ssg.lib.gradle    | 36 ----------------------
 lib/build.gradle                           |  1 -
 3 files changed, 31 insertions(+), 39 deletions(-)
 delete mode 100644 buildSrc/src/main/groovy/ssg.lib.gradle

diff --git a/buildSrc/src/main/groovy/ssg.common.gradle b/buildSrc/src/main/groovy/ssg.common.gradle
index 901fd91..ce03827 100644
--- a/buildSrc/src/main/groovy/ssg.common.gradle
+++ b/buildSrc/src/main/groovy/ssg.common.gradle
@@ -1,6 +1,8 @@
 plugins {
     id 'com.jessebrault.jbarchiva'
     id 'groovy'
+    id 'java-library'
+    id 'java-test-fixtures'
 }
 
 group 'com.jessebrault.ssg'
@@ -12,16 +14,43 @@ repositories {
 
 dependencies {
     // https://mvnrepository.com/artifact/org.apache.groovy/groovy
-    implementation 'org.apache.groovy:groovy:4.0.9'
+    api 'org.apache.groovy:groovy:4.0.9'
+
+    // https://mvnrepository.com/artifact/org.jetbrains/annotations
+    api 'org.jetbrains:annotations:24.0.0'
+
+    /**
+     * Logging
+     */
+    // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
+    implementation 'org.slf4j:slf4j-api:1.7.36'
 
     /**
      * TESTING
      */
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
+    testFixturesApi 'org.junit.jupiter:junit-jupiter-api:5.9.2'
 
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
+
+    /**
+     * Mockito
+     */
+    // https://mvnrepository.com/artifact/org.mockito/mockito-core
+    testFixturesApi 'org.mockito:mockito-core:4.11.0'
+
+    // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
+    testFixturesApi 'org.mockito:mockito-junit-jupiter:4.11.0'
+
+    /**
+     * Test Logging
+     */
+    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl
+    testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0'
+
+    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
+    testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.19.0'
 }
 
 test {
diff --git a/buildSrc/src/main/groovy/ssg.lib.gradle b/buildSrc/src/main/groovy/ssg.lib.gradle
deleted file mode 100644
index 78f61fa..0000000
--- a/buildSrc/src/main/groovy/ssg.lib.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-plugins {
-    id 'java-library'
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    // https://mvnrepository.com/artifact/org.jetbrains/annotations
-    api 'org.jetbrains:annotations:24.0.0'
-
-    /**
-     * Logging
-     */
-    // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    implementation 'org.slf4j:slf4j-api:1.7.36'
-
-    /**
-     * Test Logging
-     */
-    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl
-    testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0'
-
-    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
-    testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.19.0'
-
-    /**
-     * Mockito
-     */
-    // https://mvnrepository.com/artifact/org.mockito/mockito-core
-    testImplementation 'org.mockito:mockito-core:4.11.0'
-
-    // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
-    testImplementation 'org.mockito:mockito-junit-jupiter:4.11.0'
-}
\ No newline at end of file
diff --git a/lib/build.gradle b/lib/build.gradle
index 21b511d..53cb59f 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'ssg.common'
-    id 'ssg.lib'
 }
 
 repositories {

From 0e49414db707ca7ccc0e08e580575bd04c8eaf7e Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Mon, 13 Feb 2023 15:08:58 +0100
Subject: [PATCH 08/36] Parts now have access to all parts via a
 EmbeddablePartsMap.

---
 .../ssg/part/EmbeddablePart.groovy            |  5 ++-
 .../ssg/part/EmbeddablePartsMap.groovy        |  2 +-
 .../ssg/part/GspPartRenderer.groovy           | 12 +++++--
 .../jessebrault/ssg/part/PartRenderer.groovy  |  3 +-
 .../ssg/part/GspPartRendererTests.groovy      | 35 ++++++++++++++++---
 .../ssg/testutil/DiagnosticsUtil.groovy       | 18 ++++++++++
 6 files changed, 65 insertions(+), 10 deletions(-)
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
index ceeb31b..274716a 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
@@ -18,12 +18,15 @@ class EmbeddablePart {
     @Nullable
     private final EmbeddableText text
 
+    private final Collection<Part> allParts
+
     String render(Map binding = [:]) {
         def result = part.type.renderer.render(
                 this.part,
                 binding,
                 this.globals,
-                this.text
+                this.text,
+                this.allParts
         )
         if (result.v1.size() > 0) {
             this.onDiagnostics.call(result.v1)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
index 5473bdc..efff763 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
@@ -20,7 +20,7 @@ class EmbeddablePartsMap {
         Objects.requireNonNull(globals)
         Objects.requireNonNull(onDiagnostics)
         parts.each {
-            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text))
+            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text, parts))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index 33ec3fb..1e92479 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -18,22 +18,30 @@ class GspPartRenderer implements PartRenderer {
             Part part,
             Map binding,
             Map globals,
-            @Nullable EmbeddableText text = null
+            @Nullable EmbeddableText text = null,
+            Collection<Part> allParts
     ) {
         Objects.requireNonNull(part)
         Objects.requireNonNull(binding)
         Objects.requireNonNull(globals)
+        Objects.requireNonNull(allParts)
+        def embeddedPartDiagnostics = []
         try {
             def result = engine.createTemplate(part.text).make([
                     binding: binding,
                     globals: globals,
+                    parts: new EmbeddablePartsMap(allParts, globals, embeddedPartDiagnostics.&addAll, text),
                     tagBuilder: new DynamicTagBuilder(),
                     text: text
             ])
             new Tuple2<>([], result.toString())
         } catch (Exception e) {
+            def diagnostic = new Diagnostic(
+                    "An exception occurred while rendering part ${ part.path }:\n${ e }",
+                    e
+            )
             new Tuple2<>(
-                    [new Diagnostic("An exception occurred while rendering part ${ part.path }:\n${ e }", e)],
+                    [diagnostic, *embeddedPartDiagnostics],
                     ''
             )
         }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
index 2995b19..be508a5 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
@@ -10,7 +10,8 @@ interface PartRenderer {
             Part part,
             Map binding,
             Map globals,
-            @Nullable EmbeddableText text
+            @Nullable EmbeddableText text,
+            Collection<Part> allParts
     )
 
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index b759e59..b488499 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -3,7 +3,9 @@ package com.jessebrault.ssg.part
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.text.*
 import org.junit.jupiter.api.Test
+import org.mockito.Mock
 
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
 import static org.mockito.ArgumentMatchers.any
@@ -28,7 +30,7 @@ class GspPartRendererTests {
     @Test
     void rendersWithNoBindingOrGlobals() {
         def part = new Part('', null, 'Hello, World!')
-        def r = this.renderer.render(part, [:], [:], null)
+        def r = this.renderer.render(part, [:], [:], null, [part])
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -36,7 +38,13 @@ class GspPartRendererTests {
     @Test
     void rendersWithBinding() {
         def part = new Part('', null, "<%= binding['greeting'] %>")
-        def r = this.renderer.render(part, [greeting: 'Hello, World!'], [:], null)
+        def r = this.renderer.render(
+                part,
+                [greeting: 'Hello, World!'],
+                [:],
+                null,
+                [part]
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -44,7 +52,13 @@ class GspPartRendererTests {
     @Test
     void rendersWithGlobals() {
         def part = new Part(null, null, "<%= globals['greeting'] %>")
-        def r = this.renderer.render(part, [:], [greeting: 'Hello, World!'], null)
+        def r = this.renderer.render(
+                part,
+                [:],
+                [greeting: 'Hello, World!'],
+                null,
+                [part]
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -61,7 +75,8 @@ class GspPartRendererTests {
                         mockRenderableText('Hello, World!'),
                         [:],
                         { Collection<Diagnostic> diagnostics -> textDiagnostics.addAll(diagnostics) }
-                )
+                ),
+                [part]
         )
         assertTrue(textDiagnostics.isEmpty())
         assertTrue(r.v1.isEmpty())
@@ -71,9 +86,19 @@ class GspPartRendererTests {
     @Test
     void tagBuilderAvailable() {
         def part = new Part('', null, '<%= tagBuilder.test() %>')
-        def r = this.renderer.render(part, [:], [:], null)
+        def r = this.renderer.render(part, [:], [:], null, [part])
         assertTrue(r.v1.isEmpty())
         assertEquals('<test />', r.v2)
     }
 
+    @Test
+    void allPartsAvailable() {
+        def partType = new PartType(['.gsp'], this.renderer)
+        def part0 = new Part('part0.gsp', partType, '<%= parts["part1.gsp"].render() %>')
+        def part1 = new Part('part1.gsp', partType, 'Hello, World!')
+        def r = this.renderer.render(part0, [:], [:], null, [part0, part1])
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
+        assertEquals('Hello, World!', r.v2)
+    }
+
 }
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
new file mode 100644
index 0000000..10d4e16
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
@@ -0,0 +1,18 @@
+package com.jessebrault.ssg.testutil
+
+import com.jessebrault.ssg.Diagnostic
+
+class DiagnosticsUtil {
+
+    static Closure<String> getDiagnosticsMessageSupplier(Collection<Diagnostic> diagnostics) {
+        return {
+            diagnostics.collect {
+                def writer = new StringWriter()
+                it.exception.printStackTrace(new PrintWriter(writer))
+                def stackTrace = writer.toString()
+                "$it.message\n$stackTrace"
+            }.join('\n')
+        }
+    }
+
+}

From 94c6edacba22dd3b29c7d5b1ca17c6b2ba2d093c Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Mon, 13 Feb 2023 15:15:09 +0100
Subject: [PATCH 09/36] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f009e91..34cd151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
+- Parts have access to all other parts now via `parts`, an object of type [`EmbeddablePartsMap`](lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy). For example:
+
+    ```gsp
+    // myPart.gsp
+    <% out << parts['otherPart.gsp'].render() %>
+    ```
+    
+  [0e49414](https://github.com/JesseBrault0709/ssg/commit/0e49414).
 - A `tagBuilder` object of type [`DynamicTagBuilder`](lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy) is available in Templates, SpecialPages, and Parts.
 
     ```groovy

From 5e2c682132958191946a6aac903f5113f46793fc Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Mon, 13 Feb 2023 15:15:41 +0100
Subject: [PATCH 10/36] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34cd151..159acdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,8 +35,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
   This is likely most useful for building simple, one-line html/xml tags. [93687d](https://github.com/JesseBrault0709/ssg/commit/936587d).
 - Parts have a `text` object of type [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy). If one is rendering a Part called from anything other than a Template (which has an associated text), this will be `null`. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
 
-### Changed
-- **Breaking**: the `text` object in Templates is now an instance of [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy) instead of `String`. Thus, one must use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
+### Breaking Changes
+- The `text` object in Templates is now an instance of [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy) instead of `String`. Thus, one must use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
 
 ### Deprecated
 - The `frontMatter` object in Templates is now deprecated. Use `text.frontMatter` instead. [eafc8cd](https://github.com/JesseBrault0709/ssg/commit/eafc8cd).

From 3b8cf46260a126868ac31138e8a40ffb369a0234 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Mon, 13 Feb 2023 15:16:30 +0100
Subject: [PATCH 11/36] Cleaned up unused import.

---
 .../groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index b488499..48cfa42 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -3,7 +3,6 @@ package com.jessebrault.ssg.part
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.text.*
 import org.junit.jupiter.api.Test
-import org.mockito.Mock
 
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
 import static org.junit.jupiter.api.Assertions.assertEquals

From 0371d41ccc4fb37df4681b967cf160e929d4e7bc Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Tue, 14 Feb 2023 13:19:28 +0100
Subject: [PATCH 12/36] Added path and urlBuilder to gsp dsl.

---
 .../ssg/part/EmbeddablePart.groovy            |  5 +-
 .../ssg/part/EmbeddablePartsMap.groovy        |  5 +-
 .../ssg/part/GspPartRenderer.groovy           | 11 ++-
 .../jessebrault/ssg/part/PartRenderer.groovy  |  3 +-
 .../specialpage/GspSpecialPageRenderer.groovy | 16 ++--
 .../ssg/template/GspTemplateRenderer.groovy   |  7 +-
 .../ssg/url/PathBasedUrlBuilder.groovy        | 23 +++++
 .../com/jessebrault/ssg/url/UrlBuilder.groovy |  5 ++
 .../ssg/part/GspPartRendererTests.groovy      | 70 +++++++++------
 .../GspSpecialPageRendererTests.groovy        | 50 ++++++++---
 .../template/GspTemplateRendererTests.groovy  | 86 ++++++++++---------
 .../ssg/url/PathBasedUrlBuilderTests.groovy   | 10 +++
 .../ssg/testutil/DiagnosticsUtil.groovy       |  6 ++
 .../com/jessebrault/ssg/text/TextMocks.groovy | 37 ++++++++
 .../ssg/url/AbstractUrlBuilderTests.groovy    | 33 +++++++
 15 files changed, 271 insertions(+), 96 deletions(-)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
 create mode 100644 lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
index 274716a..e696335 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
@@ -20,13 +20,16 @@ class EmbeddablePart {
 
     private final Collection<Part> allParts
 
+    private final String path
+
     String render(Map binding = [:]) {
         def result = part.type.renderer.render(
                 this.part,
                 binding,
                 this.globals,
                 this.text,
-                this.allParts
+                this.allParts,
+                this.path
         )
         if (result.v1.size() > 0) {
             this.onDiagnostics.call(result.v1)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
index efff763..290f8ee 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
@@ -14,13 +14,14 @@ class EmbeddablePartsMap {
             Collection<Part> parts,
             Map globals,
             Closure onDiagnostics,
-            @Nullable EmbeddableText text = null
+            @Nullable EmbeddableText text = null,
+            String path
     ) {
         Objects.requireNonNull(parts)
         Objects.requireNonNull(globals)
         Objects.requireNonNull(onDiagnostics)
         parts.each {
-            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text, parts))
+            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text, parts, path))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index 1e92479..f4716f7 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -3,6 +3,7 @@ package com.jessebrault.ssg.part
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableText
+import com.jessebrault.ssg.url.PathBasedUrlBuilder
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
@@ -19,20 +20,24 @@ class GspPartRenderer implements PartRenderer {
             Map binding,
             Map globals,
             @Nullable EmbeddableText text = null,
-            Collection<Part> allParts
+            Collection<Part> allParts,
+            String path
     ) {
         Objects.requireNonNull(part)
         Objects.requireNonNull(binding)
         Objects.requireNonNull(globals)
         Objects.requireNonNull(allParts)
+        Objects.requireNonNull(path)
         def embeddedPartDiagnostics = []
         try {
             def result = engine.createTemplate(part.text).make([
                     binding: binding,
                     globals: globals,
-                    parts: new EmbeddablePartsMap(allParts, globals, embeddedPartDiagnostics.&addAll, text),
+                    parts: new EmbeddablePartsMap(allParts, globals, embeddedPartDiagnostics.&addAll, text, path),
+                    path: path,
                     tagBuilder: new DynamicTagBuilder(),
-                    text: text
+                    text: text,
+                    urlBuilder: new PathBasedUrlBuilder(path)
             ])
             new Tuple2<>([], result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
index be508a5..7c7dc3c 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
@@ -11,7 +11,8 @@ interface PartRenderer {
             Map binding,
             Map globals,
             @Nullable EmbeddableText text,
-            Collection<Part> allParts
+            Collection<Part> allParts,
+            String path
     )
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index 6810e24..df607f1 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -6,6 +6,7 @@ import com.jessebrault.ssg.part.EmbeddablePartsMap
 import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableTextsCollection
 import com.jessebrault.ssg.text.Text
+import com.jessebrault.ssg.url.PathBasedUrlBuilder
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
@@ -18,18 +19,23 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
     private static final TemplateEngine engine = new GStringTemplateEngine()
 
     @Override
-    Tuple2<Collection<Diagnostic>, String> render(SpecialPage specialPage, Collection<Text> texts, Collection<Part> parts, Map globals) {
+    Tuple2<Collection<Diagnostic>, String> render(
+            SpecialPage specialPage,
+            Collection<Text> texts,
+            Collection<Part> parts,
+            Map globals
+    ) {
         try {
             Collection<Diagnostic> diagnostics = []
             def result = engine.createTemplate(specialPage.text).make([
                     globals: globals,
-                    parts: new EmbeddablePartsMap(parts, globals, { Collection<Diagnostic> partDiagnostics ->
-                        diagnostics.addAll(partDiagnostics)
-                    }),
+                    parts: new EmbeddablePartsMap(parts, globals, diagnostics.&addAll, specialPage.path),
+                    path: specialPage.path,
                     tagBuilder: new DynamicTagBuilder(),
                     texts: new EmbeddableTextsCollection(texts, globals, { Collection<Diagnostic> textDiagnostics ->
                         diagnostics.addAll(textDiagnostics)
-                    })
+                    }),
+                    urlBuilder: new PathBasedUrlBuilder(specialPage.path)
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index 0e01342..901b90e 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -7,6 +7,7 @@ import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableText
 import com.jessebrault.ssg.text.FrontMatter
 import com.jessebrault.ssg.text.Text
+import com.jessebrault.ssg.url.PathBasedUrlBuilder
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
@@ -36,9 +37,11 @@ class GspTemplateRenderer implements TemplateRenderer {
             def result = engine.createTemplate(template.text).make([
                     frontMatter: frontMatter,
                     globals: globals,
-                    parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText),
+                    parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText, text.path),
+                    path: text.path,
                     tagBuilder: new DynamicTagBuilder(),
-                    text: embeddableText
+                    text: embeddableText,
+                    urlBuilder: new PathBasedUrlBuilder(text.path)
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
new file mode 100644
index 0000000..c4065f3
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
@@ -0,0 +1,23 @@
+package com.jessebrault.ssg.url
+
+import java.nio.file.Path
+
+class PathBasedUrlBuilder implements UrlBuilder {
+
+    private final Path fromDirectory
+
+    PathBasedUrlBuilder(String fromFile) {
+        def fromFilePath = Path.of(fromFile)
+        if (fromFilePath.parent) {
+            this.fromDirectory = fromFilePath.parent
+        } else {
+            this.fromDirectory = Path.of('')
+        }
+    }
+
+    @Override
+    String relative(String to) {
+        this.fromDirectory.relativize(Path.of(to)).toString()
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
new file mode 100644
index 0000000..d7a2a26
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
@@ -0,0 +1,5 @@
+package com.jessebrault.ssg.url
+
+interface UrlBuilder {
+    String relative(String to)
+}
\ No newline at end of file
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index 48cfa42..49165ab 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -1,35 +1,22 @@
 package com.jessebrault.ssg.part
 
-import com.jessebrault.ssg.Diagnostic
-import com.jessebrault.ssg.text.*
+import com.jessebrault.ssg.text.EmbeddableText
 import org.junit.jupiter.api.Test
 
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
+import static com.jessebrault.ssg.text.TextMocks.renderableText
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
-import static org.mockito.ArgumentMatchers.any
-import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
 
 class GspPartRendererTests {
 
-    /**
-     * TODO: move to a fixture
-     */
-    private static Text mockRenderableText(String text) {
-        def textRenderer = mock(TextRenderer)
-        when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
-        def frontMatterGetter = mock(FrontMatterGetter)
-        def excerptGetter = mock(ExcerptGetter)
-        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
-    }
-
     private final PartRenderer renderer = new GspPartRenderer()
 
     @Test
     void rendersWithNoBindingOrGlobals() {
         def part = new Part('', null, 'Hello, World!')
-        def r = this.renderer.render(part, [:], [:], null, [part])
+        def r = this.renderer.render(part, [:], [:], null, [part], '')
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -42,7 +29,8 @@ class GspPartRendererTests {
                 [greeting: 'Hello, World!'],
                 [:],
                 null,
-                [part]
+                [part],
+                ''
         )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
@@ -56,7 +44,8 @@ class GspPartRendererTests {
                 [:],
                 [greeting: 'Hello, World!'],
                 null,
-                [part]
+                [part],
+                ''
         )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
@@ -70,12 +59,9 @@ class GspPartRendererTests {
                 part,
                 [:],
                 [:],
-                new EmbeddableText(
-                        mockRenderableText('Hello, World!'),
-                        [:],
-                        { Collection<Diagnostic> diagnostics -> textDiagnostics.addAll(diagnostics) }
-                ),
-                [part]
+                new EmbeddableText(renderableText('Hello, World!'), [:], textDiagnostics.&addAll),
+                [part],
+                ''
         )
         assertTrue(textDiagnostics.isEmpty())
         assertTrue(r.v1.isEmpty())
@@ -85,7 +71,7 @@ class GspPartRendererTests {
     @Test
     void tagBuilderAvailable() {
         def part = new Part('', null, '<%= tagBuilder.test() %>')
-        def r = this.renderer.render(part, [:], [:], null, [part])
+        def r = this.renderer.render(part, [:], [:], null, [part], '')
         assertTrue(r.v1.isEmpty())
         assertEquals('<test />', r.v2)
     }
@@ -95,9 +81,39 @@ class GspPartRendererTests {
         def partType = new PartType(['.gsp'], this.renderer)
         def part0 = new Part('part0.gsp', partType, '<%= parts["part1.gsp"].render() %>')
         def part1 = new Part('part1.gsp', partType, 'Hello, World!')
-        def r = this.renderer.render(part0, [:], [:], null, [part0, part1])
+        def r = this.renderer.render(part0, [:], [:], null, [part0, part1], '')
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
     }
 
+    @Test
+    void pathAvailableIfPresent() {
+        def part = new Part('', null, '<%= path %>')
+        def r = this.renderer.render(
+                part,
+                [:],
+                [:],
+                null,
+                [part],
+                'test.md'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('test.md', r.v2)
+    }
+
+    @Test
+    void urlBuilderAvailable() {
+        def part = new Part('', null, '<%= urlBuilder.relative("images/test.jpg") %>')
+        def r = this.renderer.render(
+                part,
+                [:],
+                [:],
+                null,
+                [part],
+                'test.md'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('images/test.jpg', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index df0a597..5a61fcb 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -9,8 +9,8 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
 
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertTrue
 import static org.mockito.ArgumentMatchers.any
 import static org.mockito.ArgumentMatchers.argThat
 import static org.mockito.Mockito.when
@@ -22,39 +22,41 @@ class GspSpecialPageRendererTests {
 
     @Test
     void rendersGlobal() {
-        def specialPage = new SpecialPage("<%= globals['greeting'] %>", null, null)
+        def specialPage = new SpecialPage("<%= globals['greeting'] %>", 'test.gsp', null)
         def globals = [greeting: 'Hello, World!']
         def r = this.renderer.render(specialPage, [], [], globals)
-        assertTrue(r.v1.size() == 0)
+        assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
 
     @Test
     void rendersPartWithNoBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(any(), any(), any(), any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(any(), any(), any(), any(), any(), any()))
+                .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType , '')
 
-        def specialPage = new SpecialPage("<%= parts['test'].render() %>", null, null)
+        def specialPage = new SpecialPage("<%= parts['test'].render() %>", 'test.gsp', null)
         def r = this.renderer.render(specialPage, [], [part], [:])
-        assertTrue(r.v1.size() == 0)
+        assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
 
     @Test
     void rendersPartWithBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(any(), argThat { Map m -> m.get('greeting') == 'Hello, World!'}, any(), any()))
-                .thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(
+                any(), argThat { Map m -> m.get('greeting') == 'Hello, World!'}, any(), any(), any(), any()
+        )).thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, '')
 
         def specialPage = new SpecialPage(
                 "<%= parts['test'].render([greeting: 'Hello, World!'])",
-                null,
+                'test.gsp',
                 null
         )
         def r = this.renderer.render(specialPage, [], [part], [:])
-        assertTrue(r.v1.size() == 0)
+        assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
 
@@ -67,20 +69,40 @@ class GspSpecialPageRendererTests {
 
         def specialPage = new SpecialPage(
                 "<%= texts.find { it.path == 'test' }.render() %>",
-                null,
+                'test.gsp',
                 null
         )
         def r = this.renderer.render(specialPage, [text], [], [:])
-        assertTrue(r.v1.size() == 0)
+        assertEmptyDiagnostics(r)
         assertEquals('<p><strong>Hello, World!</strong></p>\n', r.v2)
     }
 
     @Test
     void tagBuilderAvailable() {
-        def specialPage = new SpecialPage('<%= tagBuilder.test() %>', null, null)
+        def specialPage = new SpecialPage('<%= tagBuilder.test() %>', 'test.gsp', null)
         def r = this.renderer.render(specialPage, [], [], [:])
-        assertTrue(r.v1.isEmpty())
+        assertEmptyDiagnostics(r)
         assertEquals('<test />', r.v2)
     }
 
+    @Test
+    void pathAvailable() {
+        def specialPage = new SpecialPage('<%= path %>', 'test.gsp', null)
+        def r = this.renderer.render(specialPage, [], [], [:])
+        assertEmptyDiagnostics(r)
+        assertEquals('test.gsp', r.v2)
+    }
+
+    @Test
+    void urlBuilderAvailable() {
+        def specialPage = new SpecialPage(
+                '<%= urlBuilder.relative("images/test.jpg") %>',
+                'test.gsp',
+                null
+        )
+        def r = this.renderer.render(specialPage, [], [], [:])
+        assertEmptyDiagnostics(r)
+        assertEquals('images/test.jpg', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index 50684a7..5b301ea 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -3,48 +3,23 @@ package com.jessebrault.ssg.template
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.part.PartRenderer
 import com.jessebrault.ssg.part.PartType
-import com.jessebrault.ssg.text.ExcerptGetter
 import com.jessebrault.ssg.text.FrontMatter
-import com.jessebrault.ssg.text.FrontMatterGetter
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.text.TextRenderer
-import com.jessebrault.ssg.text.TextType
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
 
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
+import static com.jessebrault.ssg.text.TextMocks.*
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
 import static org.mockito.ArgumentMatchers.any
 import static org.mockito.ArgumentMatchers.argThat
-import static org.mockito.Mockito.mock
 import static org.mockito.Mockito.when
 
 @ExtendWith(MockitoExtension)
 class GspTemplateRendererTests {
 
-    /**
-     * TODO: move to a fixture
-     */
-    private static Text mockBlankText() {
-        def textRenderer = mock(TextRenderer)
-        def frontMatterGetter = mock(FrontMatterGetter)
-        def excerptGetter = mock(ExcerptGetter)
-        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
-    }
-
-    /**
-     * TODO: move to a fixture
-     */
-    private static Text mockRenderableText(String text) {
-        def textRenderer = mock(TextRenderer)
-        when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
-        def frontMatterGetter = mock(FrontMatterGetter)
-        def excerptGetter = mock(ExcerptGetter)
-        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
-    }
-
     private final TemplateRenderer renderer = new GspTemplateRenderer()
 
     @Test
@@ -55,18 +30,19 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), any(), any(), any())).thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(any(), any(), any(), any(), any(), any()))
+                .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, null)
 
         def r = this.renderer.render(
                 template,
                 new FrontMatter(null, [:]),
-                mockBlankText(),
+                blankText(),
                 [part],
                 [:]
         )
-        assertTrue(r.v1.size() == 0)
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
     }
 
@@ -78,7 +54,7 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), argThat { Map m -> m.get('person') == 'World' }, any(), any()))
+        when(partRenderer.render(any(), argThat { Map m -> m.get('person') == 'World' }, any(), any(), any(), any()))
                 .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('greeting', partType, null)
@@ -86,11 +62,11 @@ class GspTemplateRendererTests {
         def r = this.renderer.render(
                 template,
                 new FrontMatter(null, [:]),
-                mockBlankText(),
+                blankText(),
                 [part],
                 [:]
         )
-        assertTrue(r.v1.size() == 0)
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
     }
 
@@ -100,11 +76,11 @@ class GspTemplateRendererTests {
         def r = this.renderer.render(
                 template,
                 new FrontMatter(null, [title: ['Hello!']]),
-                mockBlankText(),
+                blankText(),
                 [],
                 [:]
         )
-        assertTrue(r.v1.size() == 0)
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello!', r.v2)
     }
 
@@ -114,11 +90,11 @@ class GspTemplateRendererTests {
         def r = this.renderer.render(
                 template,
                 new FrontMatter(null, [:]),
-                mockBlankText(),
+                blankText(),
                 [],
                 [test: 'Hello, World!']
         )
-        assertTrue(r.v1.size() == 0)
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
     }
 
@@ -128,11 +104,11 @@ class GspTemplateRendererTests {
         def r = this.renderer.render(
                 template,
                 new FrontMatter(null, [:]),
-                mockRenderableText('Hello, World!'),
+                renderableText('Hello, World!'),
                 [],
                 [:]
         )
-        assertTrue(r.v1.size() == 0)
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
     }
 
@@ -142,12 +118,40 @@ class GspTemplateRendererTests {
         def r = this.renderer.render(
                 template,
                 new FrontMatter(null, [:]),
-                mockBlankText(),
+                blankText(),
                 [],
                 [:]
         )
-        assertTrue(r.v1.isEmpty())
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('<test />', r.v2)
     }
 
+    @Test
+    void pathAvailable() {
+        def template = new Template('<%= path %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                textWithPath('test.md'),
+                [],
+                [:]
+        )
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
+        assertEquals('test.md', r.v2)
+    }
+
+    @Test
+    void urlBuilderAvailable() {
+        def template = new Template('<%= urlBuilder.relative("images/test.jpg") %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                textWithPath('test.md'),
+                [],
+                [:]
+        )
+        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
+        assertEquals('images/test.jpg', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
new file mode 100644
index 0000000..4381779
--- /dev/null
+++ b/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
@@ -0,0 +1,10 @@
+package com.jessebrault.ssg.url
+
+class PathBasedUrlBuilderTests extends AbstractUrlBuilderTests {
+
+    @Override
+    protected UrlBuilder getUrlBuilder(String fromFile) {
+        new PathBasedUrlBuilder(fromFile)
+    }
+
+}
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
index 10d4e16..6405933 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
@@ -2,6 +2,8 @@ package com.jessebrault.ssg.testutil
 
 import com.jessebrault.ssg.Diagnostic
 
+import static org.junit.jupiter.api.Assertions.assertTrue
+
 class DiagnosticsUtil {
 
     static Closure<String> getDiagnosticsMessageSupplier(Collection<Diagnostic> diagnostics) {
@@ -15,4 +17,8 @@ class DiagnosticsUtil {
         }
     }
 
+    static void assertEmptyDiagnostics(Tuple2<Collection<Diagnostic>, ?> result) {
+        assertTrue(result.v1.isEmpty(), getDiagnosticsMessageSupplier(result.v1))
+    }
+
 }
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
new file mode 100644
index 0000000..b27b2d1
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
@@ -0,0 +1,37 @@
+package com.jessebrault.ssg.text
+
+import com.jessebrault.ssg.text.ExcerptGetter
+import com.jessebrault.ssg.text.FrontMatterGetter
+import com.jessebrault.ssg.text.Text
+import com.jessebrault.ssg.text.TextRenderer
+import com.jessebrault.ssg.text.TextType
+
+import static org.mockito.ArgumentMatchers.any
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.when
+
+class TextMocks {
+
+    static Text blankText() {
+        def textRenderer = mock(TextRenderer)
+        def frontMatterGetter = mock(FrontMatterGetter)
+        def excerptGetter = mock(ExcerptGetter)
+        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+    }
+
+    static Text renderableText(String text) {
+        def textRenderer = mock(TextRenderer)
+        when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
+        def frontMatterGetter = mock(FrontMatterGetter)
+        def excerptGetter = mock(ExcerptGetter)
+        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+    }
+
+    static Text textWithPath(String path) {
+        def textRenderer = mock(TextRenderer)
+        def frontMatterGetter = mock(FrontMatterGetter)
+        def excerptGetter = mock(ExcerptGetter)
+        new Text('', path, new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+    }
+
+}
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
new file mode 100644
index 0000000..ebbae9b
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
@@ -0,0 +1,33 @@
+package com.jessebrault.ssg.url
+
+import org.junit.jupiter.api.Test
+
+import static org.junit.jupiter.api.Assertions.assertEquals
+
+abstract class AbstractUrlBuilderTests {
+
+    protected abstract UrlBuilder getUrlBuilder(String fromFile);
+
+    @Test
+    void upDownDown() {
+        def builder = this.getUrlBuilder('posts/post.html')
+        assertEquals('../images/test.jpg', builder.relative('images/test.jpg'))
+    }
+
+    @Test
+    void downDown() {
+        assertEquals(
+                'images/test.jpg',
+                this.getUrlBuilder('test.html').relative('images/test.jpg')
+        )
+    }
+
+    @Test
+    void upUpDownDown() {
+        assertEquals(
+                '../../images/test.jpg',
+                this.getUrlBuilder('posts/old/test.html').relative('images/test.jpg')
+        )
+    }
+
+}

From 99836856d77ff2d643ed373704b7e0056e138864 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Tue, 14 Feb 2023 14:41:24 +0100
Subject: [PATCH 13/36] Refactored extensions related into static
 ExtensionsUtil.

---
 .../ssg/part/PartFilePartsProvider.groovy     |  6 ++-
 ...SpecialPageFileSpecialPagesProvider.groovy | 10 ++--
 .../TemplateFileTemplatesProvider.groovy      |  6 ++-
 .../ssg/text/TextFileTextsProvider.groovy     | 10 ++--
 .../ssg/util/ExtensionsUtil.groovy            | 24 +++++++++
 .../ssg/util/FileNameHandler.groovy           | 32 ------------
 .../ssg/util/RelativePathHandler.groovy       | 23 ---------
 .../ssg/util/ExtensionsUtilTests.groovy       | 49 +++++++++++++++++++
 .../ssg/util/FileNameHandlerTests.groovy      | 16 ------
 .../ssg/util/RelativePathHandlerTests.groovy  | 15 ------
 10 files changed, 93 insertions(+), 98 deletions(-)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/util/ExtensionsUtil.groovy
 delete mode 100644 lib/src/main/groovy/com/jessebrault/ssg/util/FileNameHandler.groovy
 delete mode 100644 lib/src/main/groovy/com/jessebrault/ssg/util/RelativePathHandler.groovy
 create mode 100644 lib/src/test/groovy/com/jessebrault/ssg/util/ExtensionsUtilTests.groovy
 delete mode 100644 lib/src/test/groovy/com/jessebrault/ssg/util/FileNameHandlerTests.groovy
 delete mode 100644 lib/src/test/groovy/com/jessebrault/ssg/util/RelativePathHandlerTests.groovy

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy
index 72e7cc8..b49f117 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy
@@ -1,13 +1,14 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.provider.WithWatchableDir
-import com.jessebrault.ssg.util.FileNameHandler
 import groovy.io.FileType
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
+
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
 class PartFilePartsProvider implements PartsProvider, WithWatchableDir {
@@ -24,8 +25,9 @@ class PartFilePartsProvider implements PartsProvider, WithWatchableDir {
     }
 
     private PartType getPartType(File file) {
+        def path = file.path
         this.partTypes.find {
-            it.ids.contains(new FileNameHandler(file).getExtension())
+            it.ids.contains(getExtension(path))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy
index a2ef1e3..37d6a9d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy
@@ -1,14 +1,15 @@
 package com.jessebrault.ssg.specialpage
 
 import com.jessebrault.ssg.provider.WithWatchableDir
-import com.jessebrault.ssg.util.FileNameHandler
-import com.jessebrault.ssg.util.RelativePathHandler
 import groovy.io.FileType
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
+import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
+
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
 class SpecialPageFileSpecialPagesProvider implements SpecialPagesProvider, WithWatchableDir {
@@ -25,8 +26,9 @@ class SpecialPageFileSpecialPagesProvider implements SpecialPagesProvider, WithW
     }
 
     private SpecialPageType getSpecialPageType(File file) {
+        def path = file.path
         this.specialPageTypes.find {
-            it.ids.contains(new FileNameHandler(file).getExtension())
+            it.ids.contains(getExtension(path))
         }
     }
 
@@ -41,7 +43,7 @@ class SpecialPageFileSpecialPagesProvider implements SpecialPagesProvider, WithW
                 def type = this.getSpecialPageType(it)
                 if (type != null) {
                     def relativePath = this.specialPagesDir.relativePath(it)
-                    def path = new RelativePathHandler(relativePath).getWithoutExtension()
+                    def path = stripExtension(relativePath)
                     logger.info('found specialPage {} with type {}', path, type)
                     specialPages << new SpecialPage(it.text, path, type)
                 } else {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy
index a656c1e..09bcc18 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy
@@ -1,13 +1,14 @@
 package com.jessebrault.ssg.template
 
 import com.jessebrault.ssg.provider.WithWatchableDir
-import com.jessebrault.ssg.util.FileNameHandler
 import groovy.io.FileType
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
+
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
 class TemplateFileTemplatesProvider implements TemplatesProvider, WithWatchableDir {
@@ -24,8 +25,9 @@ class TemplateFileTemplatesProvider implements TemplatesProvider, WithWatchableD
     }
 
     private TemplateType getType(File file) {
+        def path = file.path
         this.templateTypes.find {
-            it.ids.contains(new FileNameHandler(file).getExtension())
+            it.ids.contains(getExtension(path))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy
index 1eacbf9..3e6510f 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy
@@ -1,14 +1,15 @@
 package com.jessebrault.ssg.text
 
 import com.jessebrault.ssg.provider.WithWatchableDir
-import com.jessebrault.ssg.util.FileNameHandler
-import com.jessebrault.ssg.util.RelativePathHandler
 import groovy.io.FileType
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
+import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
+
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
 class TextFileTextsProvider implements TextsProvider, WithWatchableDir {
@@ -25,8 +26,9 @@ class TextFileTextsProvider implements TextsProvider, WithWatchableDir {
     }
 
     private TextType getTextType(File file) {
+        def path = file.path
         this.textTypes.find {
-            it.ids.contains(new FileNameHandler(file).getExtension())
+            it.ids.contains(getExtension(path))
         }
     }
 
@@ -41,7 +43,7 @@ class TextFileTextsProvider implements TextsProvider, WithWatchableDir {
                 def type = this.getTextType(it)
                 if (type != null) {
                     def relativePath = this.textsDir.relativePath(it)
-                    def path = new RelativePathHandler(relativePath).getWithoutExtension()
+                    def path = stripExtension(relativePath)
                     logger.debug('found textFile {} with type {}', path, type)
                     textFiles << new Text(it.text, path, type)
                 } else {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/util/ExtensionsUtil.groovy b/lib/src/main/groovy/com/jessebrault/ssg/util/ExtensionsUtil.groovy
new file mode 100644
index 0000000..b072c4c
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/util/ExtensionsUtil.groovy
@@ -0,0 +1,24 @@
+package com.jessebrault.ssg.util
+
+import java.util.regex.Pattern
+
+class ExtensionsUtil {
+
+    private static final Pattern stripExtensionPattern = ~/(.+)\..+$/
+    private static final Pattern getExtensionPattern = ~/.+(\..+)$/
+
+    static String stripExtension(String path) {
+        def m = stripExtensionPattern.matcher(path)
+        m.matches() ? m.group(1) : path
+    }
+
+    static String getExtension(String path) {
+        def m = getExtensionPattern.matcher(path)
+        if (m.matches()) {
+            m.group(1)
+        } else {
+            throw new IllegalArgumentException("cannot get extension for path: ${ path }")
+        }
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/util/FileNameHandler.groovy b/lib/src/main/groovy/com/jessebrault/ssg/util/FileNameHandler.groovy
deleted file mode 100644
index 086cf35..0000000
--- a/lib/src/main/groovy/com/jessebrault/ssg/util/FileNameHandler.groovy
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.jessebrault.ssg.util
-
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-
-@TupleConstructor(includeFields = true, defaults = false)
-@NullCheck
-@EqualsAndHashCode(includeFields = true)
-class FileNameHandler {
-
-    private final File file
-
-    String getExtension() {
-        def lastIndexOfDot = this.file.name.lastIndexOf('.')
-        if (lastIndexOfDot == -1) {
-            ''
-        } else {
-            this.file.name.substring(lastIndexOfDot)
-        }
-    }
-
-    String getWithoutExtension() {
-        this.file.name.substring(0, this.file.name.lastIndexOf('.'))
-    }
-
-    @Override
-    String toString() {
-        "FileNameHandler(file: ${ this.file })"
-    }
-
-}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/util/RelativePathHandler.groovy b/lib/src/main/groovy/com/jessebrault/ssg/util/RelativePathHandler.groovy
deleted file mode 100644
index 2258bb0..0000000
--- a/lib/src/main/groovy/com/jessebrault/ssg/util/RelativePathHandler.groovy
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.jessebrault.ssg.util
-
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-
-@TupleConstructor(includeFields = true, defaults = false)
-@NullCheck
-@EqualsAndHashCode(includeFields = true)
-class RelativePathHandler {
-
-    private final String relativePath
-
-    String getWithoutExtension() {
-        this.relativePath.subSequence(0, this.relativePath.lastIndexOf('.'))
-    }
-
-    @Override
-    String toString() {
-        "RelativePathHandler(relativePath: ${ this.relativePath })"
-    }
-
-}
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/util/ExtensionsUtilTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/util/ExtensionsUtilTests.groovy
new file mode 100644
index 0000000..438c3c8
--- /dev/null
+++ b/lib/src/test/groovy/com/jessebrault/ssg/util/ExtensionsUtilTests.groovy
@@ -0,0 +1,49 @@
+package com.jessebrault.ssg.util
+
+import org.junit.jupiter.api.Test
+
+import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
+import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
+import static org.junit.jupiter.api.Assertions.assertEquals
+
+class ExtensionsUtilTests {
+
+    static class StripExtensionTests {
+
+        @Test
+        void simple() {
+            assertEquals('test', stripExtension('test.txt'))
+        }
+
+        @Test
+        void withSlashes() {
+            assertEquals('test/test', stripExtension('test/test.txt'))
+        }
+
+        @Test
+        void withMultipleExtensions() {
+            assertEquals('test.txt', stripExtension('test.txt.html'))
+        }
+
+    }
+
+    static class GetExtensionTests {
+
+        @Test
+        void simple() {
+            assertEquals('.txt', getExtension('test.txt'))
+        }
+
+        @Test
+        void withSlashes() {
+            assertEquals('.txt', getExtension('test/test.txt'))
+        }
+
+        @Test
+        void withMultipleExtensions() {
+            assertEquals('.txt', getExtension('test.test.txt'))
+        }
+
+    }
+
+}
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/util/FileNameHandlerTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/util/FileNameHandlerTests.groovy
deleted file mode 100644
index d15f57b..0000000
--- a/lib/src/test/groovy/com/jessebrault/ssg/util/FileNameHandlerTests.groovy
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jessebrault.ssg.util
-
-import org.junit.jupiter.api.Test
-
-import static org.junit.jupiter.api.Assertions.assertEquals
-
-class FileNameHandlerTests {
-
-    @Test
-    void getsCorrectExtension() {
-        def file = new File('hello.txt')
-        def extension = new FileNameHandler(file).getExtension()
-        assertEquals('.txt', extension)
-    }
-
-}
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/util/RelativePathHandlerTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/util/RelativePathHandlerTests.groovy
deleted file mode 100644
index a82f87e..0000000
--- a/lib/src/test/groovy/com/jessebrault/ssg/util/RelativePathHandlerTests.groovy
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.jessebrault.ssg.util
-
-import org.junit.jupiter.api.Test
-
-import static org.junit.jupiter.api.Assertions.assertEquals
-
-class RelativePathHandlerTests {
-
-    @Test
-    void stripsExtension() {
-        def stripped = new RelativePathHandler('hello.txt').getWithoutExtension()
-        assertEquals('hello', stripped)
-    }
-
-}

From 076bc9bc52320e83994ed3c254314efdd799847b Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Tue, 14 Feb 2023 15:33:15 +0100
Subject: [PATCH 14/36] Refactoring of all file providers; all paths now
 include extension.

---
 .../ssg/AbstractBuildCommand.groovy           |  8 +--
 .../ssg/part/PartFilePartsProvider.groovy     | 45 ++++++-----------
 .../AbstractFileCollectionProvider.groovy     | 40 +++++++++++++++
 ...SpecialPageFileSpecialPagesProvider.groovy | 49 ++++++-------------
 .../TemplateFileTemplatesProvider.groovy      | 45 ++++++-----------
 .../ssg/text/TextFileTextsProvider.groovy     | 47 ++++++------------
 ...StaticSiteGeneratorIntegrationTests.groovy |  8 +--
 .../part/PartFilePartsProviderTests.groovy    |  5 +-
 ...alPageFileSpecialPagesProviderTests.groovy |  9 ++--
 ...TemplateFileTemplatesProviderTests.groovy} |  7 +--
 .../text/TextFileTextsProviderTests.groovy    | 14 ++++--
 11 files changed, 128 insertions(+), 149 deletions(-)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/provider/AbstractFileCollectionProvider.groovy
 rename lib/src/test/groovy/com/jessebrault/ssg/template/{PageTemplatesProviderTests.groovy => TemplateFileTemplatesProviderTests.groovy} (90%)

diff --git a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
index cc087f7..80b8cd0 100644
--- a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
+++ b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
@@ -32,10 +32,10 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
         def gspPart = new PartType(['.gsp'], new GspPartRenderer())
         def gspSpecialPage = new SpecialPageType(['.gsp'], new GspSpecialPageRenderer())
 
-        def defaultTextsProvider = new TextFileTextsProvider([markdownText], new File('texts'))
-        def defaultTemplatesProvider = new TemplateFileTemplatesProvider([gspTemplate], new File('templates'))
-        def defaultPartsProvider = new PartFilePartsProvider([gspPart], new File('parts'))
-        def defaultSpecialPagesProvider = new SpecialPageFileSpecialPagesProvider([gspSpecialPage], new File('specialPages'))
+        def defaultTextsProvider = new TextFileTextsProvider(new File('texts'), [markdownText])
+        def defaultTemplatesProvider = new TemplateFileTemplatesProvider(new File('templates'), [gspTemplate])
+        def defaultPartsProvider = new PartFilePartsProvider(new File('parts'), [gspPart])
+        def defaultSpecialPagesProvider = new SpecialPageFileSpecialPagesProvider(new File('specialPages'), [gspSpecialPage])
 
         def defaultConfig = new Config(
                 textProviders: [defaultTextsProvider],
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy
index b49f117..f445690 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartFilePartsProvider.groovy
@@ -1,55 +1,38 @@
 package com.jessebrault.ssg.part
 
-import com.jessebrault.ssg.provider.WithWatchableDir
-import groovy.io.FileType
+import com.jessebrault.ssg.provider.AbstractFileCollectionProvider
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
+import org.jetbrains.annotations.Nullable
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
-
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
-class PartFilePartsProvider implements PartsProvider, WithWatchableDir {
+class PartFilePartsProvider extends AbstractFileCollectionProvider<Part> implements PartsProvider {
 
     private static final Logger logger = LoggerFactory.getLogger(PartFilePartsProvider)
 
     private final Collection<PartType> partTypes
-    private final File partsDir
 
-    PartFilePartsProvider(Collection<PartType> partTypes, File partsDir) {
-        this.partTypes = partTypes
-        this.partsDir = partsDir
-        this.watchableDir = this.partsDir
+    PartFilePartsProvider(File partsDir, Collection<PartType> partTypes) {
+        super(partsDir)
+        this.partTypes = Objects.requireNonNull(partTypes)
     }
 
-    private PartType getPartType(File file) {
-        def path = file.path
+    private @Nullable PartType getPartType(String extension) {
         this.partTypes.find {
-            it.ids.contains(getExtension(path))
+            it.ids.contains(extension)
         }
     }
 
     @Override
-    Collection<Part> provide() {
-        if (!partsDir.isDirectory()) {
-            logger.warn('partsDir {} does not exist or is not a directory; skipping and providing no Parts', this.partsDir)
-            []
-        } else {
-            def parts = []
-            this.partsDir.eachFileRecurse(FileType.FILES) {
-                def type = this.getPartType(it)
-                if (type != null) {
-                    def relativePath = this.partsDir.relativePath(it)
-                    logger.debug('found part {}', relativePath)
-                    parts << new Part(relativePath, type, it.text)
-                } else {
-                    logger.warn('ignoring {} since there is no partType for it', it)
-                }
-            }
-            parts
+    protected @Nullable Part transformFileToT(File file, String relativePath, String extension) {
+        def partType = getPartType(extension)
+        if (!partType) {
+            logger.warn('there is no PartType for {}, ignoring', relativePath)
         }
+        partType ? new Part(relativePath, partType, file.text) : null
     }
 
     @Override
@@ -59,7 +42,7 @@ class PartFilePartsProvider implements PartsProvider, WithWatchableDir {
 
     @Override
     String toString() {
-        "PartFilePartsProvider(partsDir: ${ this.partsDir }, partTypes: ${ this.partTypes })"
+        "PartFilePartsProvider(partsDir: ${ this.dir }, partTypes: ${ this.partTypes })"
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/provider/AbstractFileCollectionProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/provider/AbstractFileCollectionProvider.groovy
new file mode 100644
index 0000000..56ae2c7
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/provider/AbstractFileCollectionProvider.groovy
@@ -0,0 +1,40 @@
+package com.jessebrault.ssg.provider
+
+import groovy.io.FileType
+import org.jetbrains.annotations.Nullable
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
+
+abstract class AbstractFileCollectionProvider<T> implements Provider<Collection<T>>, WithWatchableDir {
+
+    private static final Logger logger = LoggerFactory.getLogger(AbstractFileCollectionProvider)
+
+    protected final File dir
+
+    AbstractFileCollectionProvider(File dir) {
+        this.dir = Objects.requireNonNull(dir)
+        this.watchableDir = dir
+    }
+
+    protected abstract @Nullable T transformFileToT(File file, String relativePath, String extension)
+
+    @Override
+    Collection<T> provide() {
+        if (!this.dir.isDirectory()) {
+            logger.warn('{} does not exist or is not a directory; skipping', this.dir)
+            []
+        } else {
+            def ts = []
+            this.dir.eachFileRecurse(FileType.FILES) {
+                def t = transformFileToT(it, this.dir.relativePath(it), getExtension(it.path))
+                if (t) {
+                    ts << t
+                }
+            }
+            ts
+        }
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy
index 37d6a9d..a8d9f9c 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProvider.groovy
@@ -1,57 +1,39 @@
 package com.jessebrault.ssg.specialpage
 
-import com.jessebrault.ssg.provider.WithWatchableDir
-import groovy.io.FileType
+import com.jessebrault.ssg.provider.AbstractFileCollectionProvider
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
+import org.jetbrains.annotations.Nullable
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
-import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
-
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
-class SpecialPageFileSpecialPagesProvider implements SpecialPagesProvider, WithWatchableDir {
+class SpecialPageFileSpecialPagesProvider extends AbstractFileCollectionProvider<SpecialPage>
+        implements SpecialPagesProvider {
 
     private static final Logger logger = LoggerFactory.getLogger(SpecialPageFileSpecialPagesProvider)
 
     private final Collection<SpecialPageType> specialPageTypes
-    private final File specialPagesDir
 
-    SpecialPageFileSpecialPagesProvider(Collection<SpecialPageType> specialPageTypes, File specialPagesDir) {
-        this.specialPageTypes = specialPageTypes
-        this.specialPagesDir = specialPagesDir
-        this.watchableDir = this.specialPagesDir
+    SpecialPageFileSpecialPagesProvider(File specialPagesDir, Collection<SpecialPageType> specialPageTypes) {
+        super(specialPagesDir)
+        this.specialPageTypes = Objects.requireNonNull(specialPageTypes)
     }
 
-    private SpecialPageType getSpecialPageType(File file) {
-        def path = file.path
+    private @Nullable SpecialPageType getSpecialPageType(String extension) {
         this.specialPageTypes.find {
-            it.ids.contains(getExtension(path))
+            it.ids.contains(extension)
         }
     }
 
     @Override
-    Collection<SpecialPage> provide() {
-        if (!this.specialPagesDir.isDirectory()) {
-            logger.warn('specialPagesDir {} does not exist or is not a directory; skipping and providing no SpecialPages', this.specialPagesDir)
-            []
-        } else {
-            def specialPages = []
-            this.specialPagesDir.eachFileRecurse(FileType.FILES) {
-                def type = this.getSpecialPageType(it)
-                if (type != null) {
-                    def relativePath = this.specialPagesDir.relativePath(it)
-                    def path = stripExtension(relativePath)
-                    logger.info('found specialPage {} with type {}', path, type)
-                    specialPages << new SpecialPage(it.text, path, type)
-                } else {
-                    logger.warn('ignoring {} since there is no specialPageType for it', it)
-                }
-            }
-            specialPages
+    protected @Nullable SpecialPage transformFileToT(File file, String relativePath, String extension) {
+        def specialPageType = getSpecialPageType(extension)
+        if (!specialPageType) {
+            logger.warn('there is no SpecialPageType for {}, ignoring', relativePath)
         }
+        specialPageType ? new SpecialPage(file.text, relativePath, specialPageType) : null
     }
 
     @Override
@@ -61,7 +43,8 @@ class SpecialPageFileSpecialPagesProvider implements SpecialPagesProvider, WithW
 
     @Override
     String toString() {
-        "SpecialPageFileSpecialPagesProvider(specialPagesDir: ${ this.specialPagesDir }, specialPageTypes: ${ this.specialPageTypes })"
+        "SpecialPageFileSpecialPagesProvider(specialPagesDir: ${ this.dir }, " +
+                "specialPageTypes: ${ this.specialPageTypes })"
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy
index 09bcc18..1a08903 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProvider.groovy
@@ -1,55 +1,38 @@
 package com.jessebrault.ssg.template
 
-import com.jessebrault.ssg.provider.WithWatchableDir
-import groovy.io.FileType
+import com.jessebrault.ssg.provider.AbstractFileCollectionProvider
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
+import org.jetbrains.annotations.Nullable
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
-
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
-class TemplateFileTemplatesProvider implements TemplatesProvider, WithWatchableDir {
+class TemplateFileTemplatesProvider extends AbstractFileCollectionProvider<Template> implements TemplatesProvider {
 
     private static final Logger logger = LoggerFactory.getLogger(TemplateFileTemplatesProvider)
 
     private final Collection<TemplateType> templateTypes
-    private final File templatesDir
 
-    TemplateFileTemplatesProvider(Collection<TemplateType> templateTypes, File templatesDir) {
-        this.templateTypes = templateTypes
-        this.templatesDir = templatesDir
-        this.watchableDir = this.templatesDir
+    TemplateFileTemplatesProvider(File templatesDir, Collection<TemplateType> templateTypes) {
+        super(templatesDir)
+        this.templateTypes = Objects.requireNonNull(templateTypes)
     }
 
-    private TemplateType getType(File file) {
-        def path = file.path
+    private @Nullable TemplateType getType(String extension) {
         this.templateTypes.find {
-            it.ids.contains(getExtension(path))
+            it.ids.contains(extension)
         }
     }
 
     @Override
-    Collection<Template> provide() {
-        if (!this.templatesDir.isDirectory()) {
-            logger.warn('templatesDir {} does not exist or is not a directory; skipping and providing no Templates', this.templatesDir)
-            []
-        } else {
-            def templates = []
-            this.templatesDir.eachFileRecurse(FileType.FILES) {
-                def type = this.getType(it)
-                if (type != null) {
-                    def relativePath = this.templatesDir.relativePath(it)
-                    logger.debug('found template {}', relativePath)
-                    templates << new Template(it.text, relativePath, type)
-                } else {
-                    logger.warn('ignoring {} because there is no templateType for it', it)
-                }
-            }
-            templates
+    protected Template transformFileToT(File file, String relativePath, String extension) {
+        def templateType = getType(extension)
+        if (templateType == null) {
+            logger.warn('there is no TemplateType for template {}, ignoring', relativePath)
         }
+        templateType ? new Template(file.text, relativePath, templateType) : null
     }
 
     @Override
@@ -59,7 +42,7 @@ class TemplateFileTemplatesProvider implements TemplatesProvider, WithWatchableD
 
     @Override
     String toString() {
-        "TemplateFileTemplatesProvider(templatesDir: ${ this.templatesDir }, templateTypes: ${ this.templateTypes })"
+        "TemplateFileTemplatesProvider(templatesDir: ${ this.dir }, templateTypes: ${ this.templateTypes })"
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy b/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy
index 3e6510f..88eea80 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/text/TextFileTextsProvider.groovy
@@ -1,57 +1,38 @@
 package com.jessebrault.ssg.text
 
-import com.jessebrault.ssg.provider.WithWatchableDir
-import groovy.io.FileType
+import com.jessebrault.ssg.provider.AbstractFileCollectionProvider
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
+import org.jetbrains.annotations.Nullable
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import static com.jessebrault.ssg.util.ExtensionsUtil.getExtension
-import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
-
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
-class TextFileTextsProvider implements TextsProvider, WithWatchableDir {
+class TextFileTextsProvider extends AbstractFileCollectionProvider<Text> implements TextsProvider {
 
     private static final Logger logger = LoggerFactory.getLogger(TextFileTextsProvider)
 
     private final Collection<TextType> textTypes
-    private final File textsDir
 
-    TextFileTextsProvider(Collection<TextType> textTypes, File textsDir) {
-        this.textTypes = textTypes
-        this.textsDir = textsDir
-        this.watchableDir = this.textsDir
+    TextFileTextsProvider(File textsDir, Collection<TextType> textTypes) {
+        super(textsDir)
+        this.textTypes = Objects.requireNonNull(textTypes)
     }
 
-    private TextType getTextType(File file) {
-        def path = file.path
+    private TextType getTextType(String extension) {
         this.textTypes.find {
-            it.ids.contains(getExtension(path))
+            it.ids.contains(extension)
         }
     }
 
     @Override
-    Collection<Text> provide() {
-        if (!this.textsDir.isDirectory()) {
-            logger.warn('textsDir {} does not exist or is not a directory; skipping and providing no Texts', this.textsDir)
-            []
-        } else {
-            def textFiles = []
-            this.textsDir.eachFileRecurse(FileType.FILES) {
-                def type = this.getTextType(it)
-                if (type != null) {
-                    def relativePath = this.textsDir.relativePath(it)
-                    def path = stripExtension(relativePath)
-                    logger.debug('found textFile {} with type {}', path, type)
-                    textFiles << new Text(it.text, path, type)
-                } else {
-                    logger.warn('ignoring {} because there is no textType for it', it)
-                }
-            }
-            textFiles
+    protected @Nullable Text transformFileToT(File file, String relativePath, String extension) {
+        def textType = getTextType(extension)
+        if (!textType) {
+            logger.warn('no TextType for text {}, ignoring', file.path)
         }
+        textType ? new Text(file.text, relativePath, textType) : null
     }
 
     @Override
@@ -61,7 +42,7 @@ class TextFileTextsProvider implements TextsProvider, WithWatchableDir {
 
     @Override
     String toString() {
-        "TextFileTextsProvider(textsDir: ${ this.textsDir }, textTypes: ${ this.textTypes })"
+        "TextFileTextsProvider(textsDir: ${ this.dir }, textTypes: ${ this.textTypes })"
     }
 
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
index 4ca52bc..614df3d 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
@@ -41,10 +41,10 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         def gspPartType = new PartType(['.gsp'], new GspPartRenderer())
         def gspSpecialPageType = new SpecialPageType(['.gsp'], new GspSpecialPageRenderer())
 
-        def textsProvider = new TextFileTextsProvider([markdownTextType], this.textsDir)
-        def templatesProvider = new TemplateFileTemplatesProvider([gspTemplateType], this.templatesDir)
-        def partsProvider = new PartFilePartsProvider([gspPartType], this.partsDir)
-        def specialPagesProvider = new SpecialPageFileSpecialPagesProvider([gspSpecialPageType], this.specialPagesDir)
+        def textsProvider = new TextFileTextsProvider(this.textsDir, [markdownTextType])
+        def templatesProvider = new TemplateFileTemplatesProvider(this.templatesDir, [gspTemplateType])
+        def partsProvider = new PartFilePartsProvider(this.partsDir, [gspPartType])
+        def specialPagesProvider = new SpecialPageFileSpecialPagesProvider(this.specialPagesDir, [gspSpecialPageType])
 
         def config = new Config(
                 textProviders: [textsProvider],
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/PartFilePartsProviderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/PartFilePartsProviderTests.groovy
index 753f631..f2d5c30 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/PartFilePartsProviderTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/PartFilePartsProviderTests.groovy
@@ -4,10 +4,11 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 import static org.junit.jupiter.api.Assertions.assertEquals
+import static org.mockito.Mockito.mock
 
 class PartFilePartsProviderTests {
 
-    private static final PartType gspPartType = new PartType(['.gsp'], null)
+    private static final PartType gspPartType = new PartType(['.gsp'], mock(PartRenderer))
 
     private File partsDir
     private PartsProvider partsProvider
@@ -15,7 +16,7 @@ class PartFilePartsProviderTests {
     @BeforeEach
     void beforeEach() {
         this.partsDir = File.createTempDir()
-        partsProvider = new PartFilePartsProvider([gspPartType], this.partsDir)
+        partsProvider = new PartFilePartsProvider(this.partsDir, [gspPartType])
     }
 
     @Test
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProviderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProviderTests.groovy
index e51b3e1..cebaed0 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProviderTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/SpecialPageFileSpecialPagesProviderTests.groovy
@@ -4,10 +4,11 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 import static org.junit.jupiter.api.Assertions.assertEquals
+import static org.mockito.Mockito.mock
 
 class SpecialPageFileSpecialPagesProviderTests {
 
-    private static final SpecialPageType gspType = new SpecialPageType(['.gsp'], null)
+    private static final SpecialPageType gspType = new SpecialPageType(['.gsp'], mock(SpecialPageRenderer))
 
     private File specialPagesDir
     private SpecialPagesProvider specialPagesProvider
@@ -15,7 +16,7 @@ class SpecialPageFileSpecialPagesProviderTests {
     @BeforeEach
     void beforeEach() {
         this.specialPagesDir = File.createTempDir()
-        this.specialPagesProvider = new SpecialPageFileSpecialPagesProvider([gspType], this.specialPagesDir)
+        this.specialPagesProvider = new SpecialPageFileSpecialPagesProvider(this.specialPagesDir, [gspType])
     }
 
     @Test
@@ -26,7 +27,7 @@ class SpecialPageFileSpecialPagesProviderTests {
         def r = this.specialPagesProvider.provide()
         assertEquals(1, r.size())
         def f0 = r[0]
-        assertEquals('test', f0.path)
+        assertEquals('test.gsp', f0.path)
         assertEquals('<%= "Hello, World!" %>', f0.text)
         assertEquals(gspType, f0.type)
     }
@@ -40,7 +41,7 @@ class SpecialPageFileSpecialPagesProviderTests {
         def r = this.specialPagesProvider.provide()
         assertEquals(1, r.size())
         def f0 = r[0]
-        assertEquals('nested/nested', f0.path)
+        assertEquals('nested/nested.gsp', f0.path)
         assertEquals('<%= "Hello, World!" %>', f0.text)
         assertEquals(gspType, f0.type)
     }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/PageTemplatesProviderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProviderTests.groovy
similarity index 90%
rename from lib/src/test/groovy/com/jessebrault/ssg/template/PageTemplatesProviderTests.groovy
rename to lib/src/test/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProviderTests.groovy
index 6099e06..871135d 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/PageTemplatesProviderTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/TemplateFileTemplatesProviderTests.groovy
@@ -4,10 +4,11 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 import static org.junit.jupiter.api.Assertions.assertEquals
+import static org.mockito.Mockito.mock
 
-class PageTemplatesProviderTests {
+class TemplateFileTemplatesProviderTests {
 
-    private static final TemplateType gspType = new TemplateType(['.gsp'], null)
+    private static final TemplateType gspType = new TemplateType(['.gsp'], mock(TemplateRenderer))
 
     private File templatesDir
     private TemplatesProvider templatesProvider
@@ -15,7 +16,7 @@ class PageTemplatesProviderTests {
     @BeforeEach
     void beforeEach() {
         this.templatesDir = File.createTempDir()
-        this.templatesProvider =  new TemplateFileTemplatesProvider([gspType], this.templatesDir)
+        this.templatesProvider =  new TemplateFileTemplatesProvider(this.templatesDir, [gspType])
     }
 
     @Test
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/text/TextFileTextsProviderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/text/TextFileTextsProviderTests.groovy
index b862a10..210c412 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/text/TextFileTextsProviderTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/text/TextFileTextsProviderTests.groovy
@@ -4,10 +4,16 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 import static org.junit.jupiter.api.Assertions.assertEquals
+import static org.mockito.Mockito.mock
 
 class TextFileTextsProviderTests {
 
-    private static final TextType markdownType = new TextType(['.md'], null, null, null)
+    private static final TextType markdownType = new TextType(
+            ['.md'],
+            mock(TextRenderer),
+            mock(FrontMatterGetter),
+            mock(ExcerptGetter)
+    )
 
     private File textsDir
     private TextsProvider textsProvider
@@ -15,7 +21,7 @@ class TextFileTextsProviderTests {
     @BeforeEach
     void beforeEach() {
         this.textsDir = File.createTempDir()
-        this.textsProvider = new TextFileTextsProvider([markdownType], this.textsDir)
+        this.textsProvider = new TextFileTextsProvider(this.textsDir, [markdownType])
     }
 
     @Test
@@ -25,7 +31,7 @@ class TextFileTextsProviderTests {
         def r = this.textsProvider.provide()
         assertEquals(1, r.size())
         def f0 = r[0]
-        assertEquals('test', f0.path)
+        assertEquals('test.md', f0.path)
         assertEquals('**Hello, World!**', f0.text)
         assertEquals(markdownType, f0.type)
     }
@@ -39,7 +45,7 @@ class TextFileTextsProviderTests {
         def r = this.textsProvider.provide()
         assertEquals(1, r.size())
         def f0 = r[0]
-        assertEquals('nested/nested', f0.path)
+        assertEquals('nested/nested.md', f0.path)
         assertEquals('**Hello!**', f0.text)
         assertEquals(markdownType, f0.type)
     }

From 8bdacbaec4df25189f73aba8b39f94978a1ad213 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Tue, 14 Feb 2023 16:10:23 +0100
Subject: [PATCH 15/36] Update CHANGELOG.md

---
 CHANGELOG.md | 62 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 159acdf..1088f02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,34 +8,72 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
+- Templates, SpecialPages, and Parts all have access to `path` of type `String` representing the path of the 'source' file: either a text file or a special page. In Templates, the 'source' comes from the path of the Text being rendered; in SpecialPages, this comes from the path of the SpecialPage being rendered (i.e., itself); in Parts, this comes from either the Template or SpecialPage which called the Part. 
+    ```gsp
+    <%
+        // in a template or part when rendering a text at 'home.md'
+        assert path == 'home.md'
+    
+        // in a template or part when rendering a text at 'posts/helloWorld.md'
+        assert path == 'posts/helloWorld.md'
+    
+        // in a special page or part when rendering a special page at 'foo/bar/specialPage.gsp'
+        assert path == 'foo/bar/specialPage.gsp'
+    %>
+    ```
+  [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41), [9983685](https://github.com/JesseBrault0709/ssg/commit/9983685), [076bc9b](https://github.com/JesseBrault0709/ssg/commit/076bc9b).
+- Templates, SpecialPages, and Parts all have access to a `urlBuilder` of type [`PathBasedUrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy) (implementing [`UrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy)). Use it like so:
+    ```gsp
+    <%
+        // when path == 'nested/post.whatever'
+        assert urlBuilder.relative('images/test.jpg') == '../images/test.jpg'
+    
+        // when path == 'simple.whatever'
+        assert urlBuilder.relative('images/test.jpg') == 'images/test.jpg'
+    %>
+    ```
+  *Nota bene:* likely will break on Windows since `PathBasedUrlBuilder` currently uses Java's `Path` api and paths would be thusly rendered using Windows-style backslashes. [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41).
 - Parts have access to all other parts now via `parts`, an object of type [`EmbeddablePartsMap`](lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy). For example:
 
     ```gsp
-    // myPart.gsp
-    <% out << parts['otherPart.gsp'].render() %>
+    <% 
+        // myPart.gsp
+        out << parts['otherPart.gsp'].render()
+    %>
     ```
     
   [0e49414](https://github.com/JesseBrault0709/ssg/commit/0e49414).
-- A `tagBuilder` object of type [`DynamicTagBuilder`](lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy) is available in Templates, SpecialPages, and Parts.
+- A `tagBuilder` object of type [`DynamicTagBuilder`](lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/DynamicTagBuilder.groovy) (implementing [`TagBuilder`](lib/src/main/groovy/com/jessebrault/ssg/tagbuilder/TagBuilder.groovy)) is available in Templates, SpecialPages, and Parts.
 
-    ```groovy
-    def simpleTag = tagBuilder.test()
-    assert simpleTag == '<test />'
+    ```gsp
+    <%
+        def simpleTag = tagBuilder.test()
+        assert simpleTag == '<test />'
   
-    def tagWithBody = tagBuilder.title 'Hello, World!'
-    assert tagWithBody == '<title>Hello, World!</title>'
+        def tagWithBody = tagBuilder.title 'Hello, World!'
+        assert tagWithBody == '<title>Hello, World!</title>'
     
-    def tagWithAttributes = tagBuilder.meta name: 'og:title', content: 'Hello, World!'
-    assert tagWithAttributes == '<meta name="og:title" content="Hello, World!" />'
+        def tagWithAttributes = tagBuilder.meta name: 'og:title', content: 'Hello, World!'
+        assert tagWithAttributes == '<meta name="og:title" content="Hello, World!" />'
   
-    def tagWithAttributesAndBody = tagBuilder.p([id: 'my-paragraph'], 'Hello, World!')
-    assert tagWithAttributesAndBody == '<p id="my-paragraph">Hello, World!</p>'
+        def tagWithAttributesAndBody = tagBuilder.p([id: 'my-paragraph'], 'Hello, World!')
+        assert tagWithAttributesAndBody == '<p id="my-paragraph">Hello, World!</p>'
+    %>
     ```
     
   This is likely most useful for building simple, one-line html/xml tags. [93687d](https://github.com/JesseBrault0709/ssg/commit/936587d).
 - Parts have a `text` object of type [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy). If one is rendering a Part called from anything other than a Template (which has an associated text), this will be `null`. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
 
 ### Breaking Changes
+- The `path` object of type `String`, where it did previously exist, was stripped of its extension when previously referring to Texts or SpecialPages; now, the extension is present. For example:
+    ```gsp
+    <%
+        // suppose we have a text called 'test.md' and we are in a template, special page, or part
+        assert texts['test'] == null
+        assert texts['test.md'] != null
+    %>
+    ```
+  [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41).
 - The `text` object in Templates is now an instance of [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy) instead of `String`. Thus, one must use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
 
 ### Deprecated

From bbb0484a749fd45dac6367b4b5044ffc082ed03b Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Wed, 15 Feb 2023 10:16:42 +0100
Subject: [PATCH 16/36] Added InputPages; fixed output paths.

---
 .../ssg/AbstractBuildCommand.groovy           |  7 +++--
 .../com/jessebrault/ssg/GeneratedPage.groovy  | 20 -------------
 .../ssg/SimpleStaticSiteGenerator.groovy      |  9 +++---
 .../ssg/StaticSiteGenerator.groovy            |  4 ++-
 .../jessebrault/ssg/input/InputPage.groovy    |  5 ++++
 .../jessebrault/ssg/output/OutputPage.groovy  | 30 +++++++++++++++++++
 .../specialpage/GspSpecialPageRenderer.groovy |  4 +--
 .../ssg/specialpage/SpecialPage.groovy        |  3 +-
 .../com/jessebrault/ssg/text/Text.groovy      |  3 +-
 ...StaticSiteGeneratorIntegrationTests.groovy | 28 +++++++++--------
 10 files changed, 67 insertions(+), 46 deletions(-)
 delete mode 100644 lib/src/main/groovy/com/jessebrault/ssg/GeneratedPage.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy

diff --git a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
index 80b8cd0..dba4ed5 100644
--- a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
+++ b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg
 
 import com.jessebrault.ssg.buildscript.GroovyBuildScriptRunner
+import com.jessebrault.ssg.output.OutputPage
 import com.jessebrault.ssg.part.GspPartRenderer
 import com.jessebrault.ssg.part.PartFilePartsProvider
 import com.jessebrault.ssg.part.PartType
@@ -75,10 +76,10 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
                     logger.error(it.message)
                 }
             } else {
-                result.v2.each { GeneratedPage generatedPage ->
-                    def target = new File(it.outDir, generatedPage.path + '.html')
+                result.v2.each { OutputPage outputPage ->
+                    def target = new File(it.outDir, outputPage.path)
                     target.createParentDirectories()
-                    target.write(generatedPage.html)
+                    target.write(outputPage.content)
                 }
             }
         }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/GeneratedPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/GeneratedPage.groovy
deleted file mode 100644
index 6b92787..0000000
--- a/lib/src/main/groovy/com/jessebrault/ssg/GeneratedPage.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jessebrault.ssg
-
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-
-@TupleConstructor(includeFields = true, defaults = false)
-@NullCheck
-@EqualsAndHashCode
-class GeneratedPage {
-
-    String path
-    String html
-
-    @Override
-    String toString() {
-        "GeneratedPage(path: ${ this.path })"
-    }
-
-}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
index 04504ed..53d2a43 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg
 
+import com.jessebrault.ssg.output.OutputPage
 import com.jessebrault.ssg.text.FrontMatter
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
@@ -19,7 +20,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
     private static final Marker exit = MarkerFactory.getMarker('EXIT')
 
     @Override
-    Tuple2<Collection<Diagnostic>, Collection<GeneratedPage>> generate(Build build) {
+    Tuple2<Collection<Diagnostic>, Collection<OutputPage>> generate(Build build) {
         logger.trace(enter, 'build: {}', build)
         logger.info('processing build with name: {}', build.name)
 
@@ -35,7 +36,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
 
         def globals = build.globals
         Collection<Diagnostic> diagnostics = []
-        Collection<GeneratedPage> generatedPages = []
+        Collection<OutputPage> generatedPages = []
 
         // Generate pages from each text, but only those that have a 'template' frontMatter field with a valid value
         texts.each {
@@ -87,7 +88,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
 
             // Create a GeneratedPage
-            generatedPages << new GeneratedPage(it.path, renderedTemplate)
+            generatedPages << OutputPage.of(it, '.html', renderedTemplate)
         }
 
         // Generate special pages
@@ -105,7 +106,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
 
             // Create a GeneratedPage
-            generatedPages << new GeneratedPage(it.path, renderedSpecialPage)
+            generatedPages << OutputPage.of(it, '.html', renderedSpecialPage)
         }
 
         logger.trace(exit, '\n\tdiagnostics: {}\n\tgeneratedPages: {}', diagnostics, generatedPages)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
index 8553be4..37573c9 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
@@ -1,5 +1,7 @@
 package com.jessebrault.ssg
 
+import com.jessebrault.ssg.output.OutputPage
+
 interface StaticSiteGenerator {
-    Tuple2<Collection<Diagnostic>, Collection<GeneratedPage>> generate(Build build)
+    Tuple2<Collection<Diagnostic>, Collection<OutputPage>> generate(Build build)
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy
new file mode 100644
index 0000000..1e37f22
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy
@@ -0,0 +1,5 @@
+package com.jessebrault.ssg.input
+
+interface InputPage {
+    String getPath()
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
new file mode 100644
index 0000000..c4a17b1
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
@@ -0,0 +1,30 @@
+package com.jessebrault.ssg.output
+
+import com.jessebrault.ssg.input.InputPage
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+
+import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
+
+@NullCheck
+@EqualsAndHashCode
+final class OutputPage {
+
+    static OutputPage of(InputPage inputFile, String extension, String content) {
+        new OutputPage(stripExtension(inputFile.path) + extension, content)
+    }
+
+    final String path
+    final String content
+
+    private OutputPage(String path, String content) {
+        this.path = path
+        this.content = content
+    }
+
+    @Override
+    String toString() {
+        "GeneratedPage(path: ${ this.path })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index df607f1..d084d16 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -32,9 +32,7 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
                     parts: new EmbeddablePartsMap(parts, globals, diagnostics.&addAll, specialPage.path),
                     path: specialPage.path,
                     tagBuilder: new DynamicTagBuilder(),
-                    texts: new EmbeddableTextsCollection(texts, globals, { Collection<Diagnostic> textDiagnostics ->
-                        diagnostics.addAll(textDiagnostics)
-                    }),
+                    texts: new EmbeddableTextsCollection(texts, globals, diagnostics.&addAll),
                     urlBuilder: new PathBasedUrlBuilder(specialPage.path)
             ])
             new Tuple2<>(diagnostics, result.toString())
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
index 869a412..c3df5fa 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.specialpage
 
+import com.jessebrault.ssg.input.InputPage
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
@@ -7,7 +8,7 @@ import groovy.transform.TupleConstructor
 @TupleConstructor(defaults = false)
 @NullCheck
 @EqualsAndHashCode
-class SpecialPage {
+class SpecialPage implements InputPage {
 
     String text
     String path
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy b/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
index ad6fccc..a81275d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.text
 
+import com.jessebrault.ssg.input.InputPage
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
@@ -7,7 +8,7 @@ import groovy.transform.TupleConstructor
 @TupleConstructor(defaults = false)
 @NullCheck
 @EqualsAndHashCode
-class Text {
+class Text implements InputPage {
 
     String text
     String path
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
index 614df3d..2a009b1 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
@@ -17,6 +17,7 @@ import com.jessebrault.ssg.text.TextType
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static org.junit.jupiter.api.Assertions.*
 
 class SimpleStaticSiteGeneratorIntegrationTests {
@@ -65,12 +66,12 @@ class SimpleStaticSiteGeneratorIntegrationTests {
 
         def result = this.ssg.generate(this.build)
 
-        assertTrue(result.v1.size() == 0)
+        assertEmptyDiagnostics(result)
         assertTrue(result.v2.size() == 1)
 
         def p0 = result.v2[0]
-        assertEquals('test', p0.path)
-        assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.html)
+        assertEquals('test.html', p0.path)
+        assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.content)
     }
 
     @Test
@@ -85,39 +86,40 @@ class SimpleStaticSiteGeneratorIntegrationTests {
 
         def result = this.ssg.generate(this.build)
 
-        assertTrue(result.v1.size() == 0)
+        assertEmptyDiagnostics(result)
         assertTrue(result.v2.size() == 1)
 
         def p0 = result.v2[0]
-        assertEquals('nested/nested', p0.path)
-        assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.html)
+        assertEquals('nested/nested.html', p0.path)
+        assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.content)
     }
 
     @Test
     void outputsSpecialPage() {
-        new FileTreeBuilder(this.specialPagesDir).file('special.gsp', $/<%= texts.find { it.path == 'test' }.render() %>/$)
+        new FileTreeBuilder(this.specialPagesDir)
+                .file('special.gsp', $/<%= texts.find { it.path == 'test.md' }.render() %>/$)
         new FileTreeBuilder(this.templatesDir).file('template.gsp', '<%= 1 + 1 %>')
         new FileTreeBuilder(this.textsDir).file('test.md', '---\ntemplate: template.gsp\n---\nHello, World!')
 
         def result = this.ssg.generate(this.build)
 
-        assertEquals(0, result.v1.size())
+        assertEmptyDiagnostics(result)
         assertEquals(2, result.v2.size())
 
-        def testPage = result.v2.find { it.path == 'test' }
+        def testPage = result.v2.find { it.path == 'test.html' }
         assertNotNull(testPage)
-        assertEquals('2', testPage.html)
+        assertEquals('2', testPage.content)
 
-        def specialPage = result.v2.find { it.path == 'special' }
+        def specialPage = result.v2.find { it.path == 'special.html' }
         assertNotNull(specialPage)
-        assertEquals('<p>Hello, World!</p>\n', specialPage.html)
+        assertEquals('<p>Hello, World!</p>\n', specialPage.content)
     }
 
     @Test
     void doesNotGenerateIfNoTemplateInFrontMatter() {
         new File(this.textsDir, 'test.md').write('Hello, World!')
         def result = this.ssg.generate(this.build)
-        assertEquals(0, result.v1.size())
+        assertEmptyDiagnostics(result)
         assertEquals(0, result.v2.size())
     }
 

From 6de83dff10321f01d804940b091c7a3dda5242d5 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Wed, 15 Feb 2023 11:57:02 +0100
Subject: [PATCH 17/36] Added targetPath to dsl.

---
 .../ssg/SimpleStaticSiteGenerator.groovy      | 20 +++++--
 .../jessebrault/ssg/output/OutputPage.groovy  |  3 +-
 .../specialpage/GspSpecialPageRenderer.groovy |  6 +-
 .../specialpage/SpecialPageRenderer.groovy    |  3 +-
 .../ssg/template/GspTemplateRenderer.groovy   |  6 +-
 .../ssg/template/TemplateRenderer.groovy      |  3 +-
 .../GspSpecialPageRendererTests.groovy        | 40 ++++++++++---
 .../template/GspTemplateRendererTests.groovy  | 57 ++++++++++++++++---
 8 files changed, 111 insertions(+), 27 deletions(-)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
index 53d2a43..c357c2e 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
@@ -10,6 +10,8 @@ import org.slf4j.LoggerFactory
 import org.slf4j.Marker
 import org.slf4j.MarkerFactory
 
+import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
+
 @TupleConstructor(includeFields = true)
 @NullCheck
 @EqualsAndHashCode(includeFields = true)
@@ -70,13 +72,16 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
             logger.debug('found template: {}', template)
 
+            def targetPath = stripExtension(it.path) + '.html'
+
             // Render the template using the result of rendering the text earlier
             def templateRenderResult = template.type.renderer.render(
                     template,
                     frontMatter,
                     it,
                     parts,
-                    globals
+                    globals,
+                    targetPath
             )
             String renderedTemplate
             if (templateRenderResult.v1.size() > 0) {
@@ -88,14 +93,21 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
 
             // Create a GeneratedPage
-            generatedPages << OutputPage.of(it, '.html', renderedTemplate)
+            generatedPages << new OutputPage(targetPath, renderedTemplate)
         }
 
         // Generate special pages
         specialPages.each {
             logger.info('processing specialPage: {}', it.path)
 
-            def specialPageRenderResult = it.type.renderer.render(it, texts, parts, globals)
+            def targetPath = stripExtension(it.path) + '.html'
+            def specialPageRenderResult = it.type.renderer.render(
+                    it,
+                    texts,
+                    parts,
+                    globals,
+                    targetPath
+            )
             String renderedSpecialPage
             if (specialPageRenderResult.v1.size() > 0) {
                 diagnostics.addAll(specialPageRenderResult.v1)
@@ -106,7 +118,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
 
             // Create a GeneratedPage
-            generatedPages << OutputPage.of(it, '.html', renderedSpecialPage)
+            generatedPages << new OutputPage(targetPath, renderedSpecialPage)
         }
 
         logger.trace(exit, '\n\tdiagnostics: {}\n\tgeneratedPages: {}', diagnostics, generatedPages)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
index c4a17b1..9b900d4 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
@@ -10,6 +10,7 @@ import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
 @EqualsAndHashCode
 final class OutputPage {
 
+    @Deprecated
     static OutputPage of(InputPage inputFile, String extension, String content) {
         new OutputPage(stripExtension(inputFile.path) + extension, content)
     }
@@ -17,7 +18,7 @@ final class OutputPage {
     final String path
     final String content
 
-    private OutputPage(String path, String content) {
+    OutputPage(String path, String content) {
         this.path = path
         this.content = content
     }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index d084d16..70b3b99 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -23,7 +23,8 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
             SpecialPage specialPage,
             Collection<Text> texts,
             Collection<Part> parts,
-            Map globals
+            Map globals,
+            String targetPath
     ) {
         try {
             Collection<Diagnostic> diagnostics = []
@@ -32,8 +33,9 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
                     parts: new EmbeddablePartsMap(parts, globals, diagnostics.&addAll, specialPage.path),
                     path: specialPage.path,
                     tagBuilder: new DynamicTagBuilder(),
+                    targetPath: targetPath,
                     texts: new EmbeddableTextsCollection(texts, globals, diagnostics.&addAll),
-                    urlBuilder: new PathBasedUrlBuilder(specialPage.path)
+                    urlBuilder: new PathBasedUrlBuilder(targetPath)
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
index a87f57c..c597100 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
@@ -10,7 +10,8 @@ interface SpecialPageRenderer {
             SpecialPage specialPage,
             Collection<Text> texts,
             Collection <Part> parts,
-            Map globals
+            Map globals,
+            String targetPath
     )
 
 }
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index 901b90e..a585382 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -26,7 +26,8 @@ class GspTemplateRenderer implements TemplateRenderer {
             FrontMatter frontMatter,
             Text text,
             Collection<Part> parts,
-            Map globals
+            Map globals,
+            String targetPath
     ) {
         try {
             Collection<Diagnostic> diagnostics = []
@@ -40,8 +41,9 @@ class GspTemplateRenderer implements TemplateRenderer {
                     parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText, text.path),
                     path: text.path,
                     tagBuilder: new DynamicTagBuilder(),
+                    targetPath: targetPath,
                     text: embeddableText,
-                    urlBuilder: new PathBasedUrlBuilder(text.path)
+                    urlBuilder: new PathBasedUrlBuilder(targetPath)
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
index 15f23ad..71b97fe 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
@@ -16,7 +16,8 @@ interface TemplateRenderer {
             FrontMatter frontMatter,
             Text text,
             Collection<Part> parts,
-            Map globals
+            Map globals,
+            String targetPath
     )
 
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index 5a61fcb..29bb7f0 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -24,7 +24,7 @@ class GspSpecialPageRendererTests {
     void rendersGlobal() {
         def specialPage = new SpecialPage("<%= globals['greeting'] %>", 'test.gsp', null)
         def globals = [greeting: 'Hello, World!']
-        def r = this.renderer.render(specialPage, [], [], globals)
+        def r = this.renderer.render(specialPage, [], [], globals, '')
         assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
@@ -37,7 +37,7 @@ class GspSpecialPageRendererTests {
         def part = new Part('test', partType , '')
 
         def specialPage = new SpecialPage("<%= parts['test'].render() %>", 'test.gsp', null)
-        def r = this.renderer.render(specialPage, [], [part], [:])
+        def r = this.renderer.render(specialPage, [], [part], [:], '')
         assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
@@ -55,7 +55,7 @@ class GspSpecialPageRendererTests {
                 'test.gsp',
                 null
         )
-        def r = this.renderer.render(specialPage, [], [part], [:])
+        def r = this.renderer.render(specialPage, [], [part], [:], '')
         assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
@@ -72,7 +72,7 @@ class GspSpecialPageRendererTests {
                 'test.gsp',
                 null
         )
-        def r = this.renderer.render(specialPage, [text], [], [:])
+        def r = this.renderer.render(specialPage, [text], [], [:], '')
         assertEmptyDiagnostics(r)
         assertEquals('<p><strong>Hello, World!</strong></p>\n', r.v2)
     }
@@ -80,7 +80,7 @@ class GspSpecialPageRendererTests {
     @Test
     void tagBuilderAvailable() {
         def specialPage = new SpecialPage('<%= tagBuilder.test() %>', 'test.gsp', null)
-        def r = this.renderer.render(specialPage, [], [], [:])
+        def r = this.renderer.render(specialPage, [], [], [:], '')
         assertEmptyDiagnostics(r)
         assertEquals('<test />', r.v2)
     }
@@ -88,7 +88,7 @@ class GspSpecialPageRendererTests {
     @Test
     void pathAvailable() {
         def specialPage = new SpecialPage('<%= path %>', 'test.gsp', null)
-        def r = this.renderer.render(specialPage, [], [], [:])
+        def r = this.renderer.render(specialPage, [], [], [:], '')
         assertEmptyDiagnostics(r)
         assertEquals('test.gsp', r.v2)
     }
@@ -100,9 +100,35 @@ class GspSpecialPageRendererTests {
                 'test.gsp',
                 null
         )
-        def r = this.renderer.render(specialPage, [], [], [:])
+        def r = this.renderer.render(specialPage, [], [], [:], 'test.html')
         assertEmptyDiagnostics(r)
         assertEquals('images/test.jpg', r.v2)
     }
 
+    @Test
+    void urlBuilderIsRelativeToTargetPath() {
+        def specialPage = new SpecialPage(
+                '<%= urlBuilder.relative("images/test.jpg") %>',
+                '',
+                null
+        )
+        def r = this.renderer.render(
+                specialPage, [], [], [:], 'test/test.html'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('../images/test.jpg', r.v2)
+    }
+
+    @Test
+    void targetPathAvailable() {
+        def specialPage = new SpecialPage(
+                '<%= targetPath %>',
+                '',
+                null
+        )
+        def r = this.renderer.render(specialPage, [], [], [:], 'test.html')
+        assertEmptyDiagnostics(r)
+        assertEquals('test.html', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index 5b301ea..67c171a 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -9,6 +9,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
 
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
 import static com.jessebrault.ssg.text.TextMocks.*
 import static org.junit.jupiter.api.Assertions.assertEquals
@@ -40,7 +41,8 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [part],
-                [:]
+                [:],
+                ''
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
@@ -64,7 +66,8 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [part],
-                [:]
+                [:],
+                ''
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
@@ -78,7 +81,8 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [title: ['Hello!']]),
                 blankText(),
                 [],
-                [:]
+                [:],
+                ''
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello!', r.v2)
@@ -92,7 +96,8 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [],
-                [test: 'Hello, World!']
+                [test: 'Hello, World!'],
+                ''
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
@@ -106,7 +111,8 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 renderableText('Hello, World!'),
                 [],
-                [:]
+                [:],
+                ''
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
@@ -120,7 +126,8 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [],
-                [:]
+                [:],
+                ''
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('<test />', r.v2)
@@ -134,7 +141,8 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 textWithPath('test.md'),
                 [],
-                [:]
+                [:],
+                ''
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('test.md', r.v2)
@@ -146,12 +154,43 @@ class GspTemplateRendererTests {
         def r = this.renderer.render(
                 template,
                 new FrontMatter(null, [:]),
-                textWithPath('test.md'),
+                blankText(),
                 [],
-                [:]
+                [:],
+                'test.html'
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('images/test.jpg', r.v2)
     }
 
+    @Test
+    void urlBuilderIsRelativeToTargetPath() {
+        def template = new Template('<%= urlBuilder.relative("images/test.jpg") %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                blankText(),
+                [],
+                [:],
+                'test/test.html'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('../images/test.jpg', r.v2)
+    }
+
+    @Test
+    void targetPathAvailable() {
+        def template = new Template('<%= targetPath %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                blankText(),
+                [],
+                [:],
+                'test.html'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('test.html', r.v2)
+    }
+
 }

From 06499a96160c5d922d5bb1b8aa73dd61103825c9 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Wed, 15 Feb 2023 12:15:45 +0100
Subject: [PATCH 18/36] Added targetPath to parts dsl.

---
 .../ssg/part/EmbeddablePart.groovy            |  8 ++-
 .../ssg/part/EmbeddablePartsMap.groovy        |  5 +-
 .../ssg/part/GspPartRenderer.groovy           | 17 +++++-
 .../jessebrault/ssg/part/PartRenderer.groovy  |  3 +-
 .../specialpage/GspSpecialPageRenderer.groovy |  2 +-
 .../ssg/template/GspTemplateRenderer.groovy   |  2 +-
 .../ssg/part/GspPartRendererTests.groovy      | 57 +++++++++++++++++--
 .../GspSpecialPageRendererTests.groovy        |  4 +-
 .../template/GspTemplateRendererTests.groovy  | 10 ++--
 .../com/jessebrault/ssg/text/TextMocks.groovy |  6 --
 10 files changed, 84 insertions(+), 30 deletions(-)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
index e696335..d87e01b 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
@@ -19,8 +19,8 @@ class EmbeddablePart {
     private final EmbeddableText text
 
     private final Collection<Part> allParts
-
     private final String path
+    private final String targetPath
 
     String render(Map binding = [:]) {
         def result = part.type.renderer.render(
@@ -29,7 +29,8 @@ class EmbeddablePart {
                 this.globals,
                 this.text,
                 this.allParts,
-                this.path
+                this.path,
+                this.targetPath
         )
         if (result.v1.size() > 0) {
             this.onDiagnostics.call(result.v1)
@@ -41,7 +42,8 @@ class EmbeddablePart {
 
     @Override
     String toString() {
-        "EmbeddablePart(part: ${ this.part }, globals: ${ this.globals })"
+        "EmbeddablePart(part: ${ this.part }, globals: ${ this.globals }, path: ${ this.path }, " +
+                "targetPath: ${ this.targetPath })"
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
index 290f8ee..e867f95 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
@@ -15,13 +15,14 @@ class EmbeddablePartsMap {
             Map globals,
             Closure onDiagnostics,
             @Nullable EmbeddableText text = null,
-            String path
+            String path,
+            String targetPath
     ) {
         Objects.requireNonNull(parts)
         Objects.requireNonNull(globals)
         Objects.requireNonNull(onDiagnostics)
         parts.each {
-            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text, parts, path))
+            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text, parts, path, targetPath))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index f4716f7..3448efc 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -7,6 +7,7 @@ import com.jessebrault.ssg.url.PathBasedUrlBuilder
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
 import org.jetbrains.annotations.Nullable
 
 @EqualsAndHashCode
@@ -21,23 +22,33 @@ class GspPartRenderer implements PartRenderer {
             Map globals,
             @Nullable EmbeddableText text = null,
             Collection<Part> allParts,
-            String path
+            String path,
+            String targetPath
     ) {
         Objects.requireNonNull(part)
         Objects.requireNonNull(binding)
         Objects.requireNonNull(globals)
         Objects.requireNonNull(allParts)
         Objects.requireNonNull(path)
+        Objects.requireNonNull(targetPath)
         def embeddedPartDiagnostics = []
         try {
             def result = engine.createTemplate(part.text).make([
                     binding: binding,
                     globals: globals,
-                    parts: new EmbeddablePartsMap(allParts, globals, embeddedPartDiagnostics.&addAll, text, path),
+                    parts: new EmbeddablePartsMap(
+                            allParts,
+                            globals,
+                            embeddedPartDiagnostics.&addAll,
+                            text,
+                            path,
+                            targetPath
+                    ),
                     path: path,
                     tagBuilder: new DynamicTagBuilder(),
+                    targetPath: targetPath,
                     text: text,
-                    urlBuilder: new PathBasedUrlBuilder(path)
+                    urlBuilder: new PathBasedUrlBuilder(targetPath)
             ])
             new Tuple2<>([], result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
index 7c7dc3c..70fe1a8 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
@@ -12,7 +12,8 @@ interface PartRenderer {
             Map globals,
             @Nullable EmbeddableText text,
             Collection<Part> allParts,
-            String path
+            String path,
+            String targetPath
     )
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index 70b3b99..2a01dd9 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -30,7 +30,7 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
             Collection<Diagnostic> diagnostics = []
             def result = engine.createTemplate(specialPage.text).make([
                     globals: globals,
-                    parts: new EmbeddablePartsMap(parts, globals, diagnostics.&addAll, specialPage.path),
+                    parts: new EmbeddablePartsMap(parts, globals, diagnostics.&addAll, specialPage.path, targetPath),
                     path: specialPage.path,
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index a585382..6bcb15c 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -38,7 +38,7 @@ class GspTemplateRenderer implements TemplateRenderer {
             def result = engine.createTemplate(template.text).make([
                     frontMatter: frontMatter,
                     globals: globals,
-                    parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText, text.path),
+                    parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText, text.path, targetPath),
                     path: text.path,
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index 49165ab..c48fb5d 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -16,7 +16,15 @@ class GspPartRendererTests {
     @Test
     void rendersWithNoBindingOrGlobals() {
         def part = new Part('', null, 'Hello, World!')
-        def r = this.renderer.render(part, [:], [:], null, [part], '')
+        def r = this.renderer.render(
+                part,
+                [:],
+                [:],
+                null,
+                [part],
+                '',
+                ''
+        )
         assertTrue(r.v1.size() == 0)
         assertEquals('Hello, World!', r.v2)
     }
@@ -30,6 +38,7 @@ class GspPartRendererTests {
                 [:],
                 null,
                 [part],
+                '',
                 ''
         )
         assertTrue(r.v1.size() == 0)
@@ -45,6 +54,7 @@ class GspPartRendererTests {
                 [greeting: 'Hello, World!'],
                 null,
                 [part],
+                '',
                 ''
         )
         assertTrue(r.v1.size() == 0)
@@ -61,6 +71,7 @@ class GspPartRendererTests {
                 [:],
                 new EmbeddableText(renderableText('Hello, World!'), [:], textDiagnostics.&addAll),
                 [part],
+                '',
                 ''
         )
         assertTrue(textDiagnostics.isEmpty())
@@ -71,7 +82,15 @@ class GspPartRendererTests {
     @Test
     void tagBuilderAvailable() {
         def part = new Part('', null, '<%= tagBuilder.test() %>')
-        def r = this.renderer.render(part, [:], [:], null, [part], '')
+        def r = this.renderer.render(
+                part,
+                [:],
+                [:],
+                null,
+                [part],
+                '',
+                ''
+        )
         assertTrue(r.v1.isEmpty())
         assertEquals('<test />', r.v2)
     }
@@ -81,7 +100,15 @@ class GspPartRendererTests {
         def partType = new PartType(['.gsp'], this.renderer)
         def part0 = new Part('part0.gsp', partType, '<%= parts["part1.gsp"].render() %>')
         def part1 = new Part('part1.gsp', partType, 'Hello, World!')
-        def r = this.renderer.render(part0, [:], [:], null, [part0, part1], '')
+        def r = this.renderer.render(
+                part0,
+                [:],
+                [:],
+                null,
+                [part0, part1],
+                '',
+                ''
+        )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
     }
@@ -95,7 +122,8 @@ class GspPartRendererTests {
                 [:],
                 null,
                 [part],
-                'test.md'
+                'test.md',
+                ''
         )
         assertEmptyDiagnostics(r)
         assertEquals('test.md', r.v2)
@@ -110,10 +138,27 @@ class GspPartRendererTests {
                 [:],
                 null,
                 [part],
-                'test.md'
+                '',
+                'test/test.html'
         )
         assertEmptyDiagnostics(r)
-        assertEquals('images/test.jpg', r.v2)
+        assertEquals('../images/test.jpg', r.v2)
+    }
+
+    @Test
+    void targetPathAvailable() {
+        def part = new Part('', null, '<%= targetPath %>')
+        def r = this.renderer.render(
+                part,
+                [:],
+                [:],
+                null,
+                [part],
+                '',
+                'test/test.html'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('test/test.html', r.v2)
     }
 
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index 29bb7f0..1329e52 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -31,7 +31,7 @@ class GspSpecialPageRendererTests {
 
     @Test
     void rendersPartWithNoBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(any(), any(), any(), any(), any(), any()))
+        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any()))
                 .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType , '')
@@ -45,7 +45,7 @@ class GspSpecialPageRendererTests {
     @Test
     void rendersPartWithBinding(@Mock PartRenderer partRenderer) {
         when(partRenderer.render(
-                any(), argThat { Map m -> m.get('greeting') == 'Hello, World!'}, any(), any(), any(), any()
+                any(), argThat { Map m -> m.get('greeting') == 'Hello, World!'}, any(), any(), any(), any(), any()
         )).thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, '')
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index 67c171a..8efe40d 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -31,7 +31,7 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), any(), any(), any(), any(), any()))
+        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any()))
                 .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, null)
@@ -56,7 +56,7 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), argThat { Map m -> m.get('person') == 'World' }, any(), any(), any(), any()))
+        when(partRenderer.render(any(), argThat { Map m -> m.get('person') == 'World' }, any(), any(), any(), any(), any()))
                 .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('greeting', partType, null)
@@ -69,7 +69,7 @@ class GspTemplateRendererTests {
                 [:],
                 ''
         )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
+        assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
 
@@ -84,7 +84,7 @@ class GspTemplateRendererTests {
                 [:],
                 ''
         )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
+        assertEmptyDiagnostics(r)
         assertEquals('Hello!', r.v2)
     }
 
@@ -99,7 +99,7 @@ class GspTemplateRendererTests {
                 [test: 'Hello, World!'],
                 ''
         )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
+        assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
 
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
index b27b2d1..0d31ff0 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
@@ -1,11 +1,5 @@
 package com.jessebrault.ssg.text
 
-import com.jessebrault.ssg.text.ExcerptGetter
-import com.jessebrault.ssg.text.FrontMatterGetter
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.text.TextRenderer
-import com.jessebrault.ssg.text.TextType
-
 import static org.mockito.ArgumentMatchers.any
 import static org.mockito.Mockito.mock
 import static org.mockito.Mockito.when

From 2d00c6be2ed48985b18e37d7572f733dd1b39210 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Wed, 15 Feb 2023 12:23:12 +0100
Subject: [PATCH 19/36] Update CHANGELOG.md

---
 CHANGELOG.md | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1088f02..1becaf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
-- Templates, SpecialPages, and Parts all have access to `path` of type `String` representing the path of the 'source' file: either a text file or a special page. In Templates, the 'source' comes from the path of the Text being rendered; in SpecialPages, this comes from the path of the SpecialPage being rendered (i.e., itself); in Parts, this comes from either the Template or SpecialPage which called the Part. 
+- Templates, SpecialPages, and Parts all have access to `targetPath` of type `String` representing the path of the 'output' file. For now, this is always a `.html` file.
+    ```gsp
+    <%
+        // in a template where the source text is 'foo/bar.md'
+        assert targetPath == 'foo/bar.html'
+        
+        // in a special page whose path is 'special.gsp'
+        assert targetPath == 'special.html'
+        
+        // in a part with a source text of 'foo/bar/hello.md'
+        assert targetPath == 'foo/bar/hello.html'
+        
+        // in a part with a source special page of 'foo/bar/baz/special.gsp'
+        assert targetParth == 'foo/bar/baz/special.html'
+    %>
+    ```
+    [6de83df](https://github.com/JesseBrault0709/ssg/commit/6de83df), [06499a9](https://github.com/JesseBrault0709/ssg/commit/06499a9).
+- Templates, SpecialPages, and Parts all have access to `path` of type `String` representing the path of the 'source' file: either a text file or a special page. In Templates, the 'source' comes from the path of the Text being rendered; in SpecialPages, this comes from the path of the SpecialPage being rendered (i.e., itself); in Parts, this comes from either the Template or SpecialPage which called (i.e., embedded) the Part. 
     ```gsp
     <%
         // in a template or part when rendering a text at 'home.md'
@@ -25,14 +42,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Templates, SpecialPages, and Parts all have access to a `urlBuilder` of type [`PathBasedUrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy) (implementing [`UrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy)). Use it like so:
     ```gsp
     <%
-        // when path == 'nested/post.whatever'
+        // when targetPath == 'nested/post.html'
         assert urlBuilder.relative('images/test.jpg') == '../images/test.jpg'
     
-        // when path == 'simple.whatever'
+        // when targetPath == 'simple.html'
         assert urlBuilder.relative('images/test.jpg') == 'images/test.jpg'
     %>
     ```
-  *Nota bene:* likely will break on Windows since `PathBasedUrlBuilder` currently uses Java's `Path` api and paths would be thusly rendered using Windows-style backslashes. [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41).
+  *Nota bene:* likely will break on Windows since `PathBasedUrlBuilder` currently uses Java's `Path` api and paths would be thusly rendered using Windows-style backslashes. This will be explored in the future. [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41).
 - Parts have access to all other parts now via `parts`, an object of type [`EmbeddablePartsMap`](lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy). For example:
 
     ```gsp

From 0762dc6b8bf766e3a6083e55f41941e6af1d7f73 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Wed, 15 Feb 2023 15:37:30 +0100
Subject: [PATCH 20/36] UrlBuilder now has absolute method.

---
 .../jessebrault/ssg/url/PathBasedUrlBuilder.groovy    | 11 +++++++++--
 .../groovy/com/jessebrault/ssg/url/UrlBuilder.groovy  |  1 +
 .../ssg/url/PathBasedUrlBuilderTests.groovy           |  4 ++--
 .../ssg/url/AbstractUrlBuilderTests.groovy            | 10 +++++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
index c4065f3..4050712 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
@@ -4,10 +4,12 @@ import java.nio.file.Path
 
 class PathBasedUrlBuilder implements UrlBuilder {
 
+    private final String absolute
     private final Path fromDirectory
 
-    PathBasedUrlBuilder(String fromFile) {
-        def fromFilePath = Path.of(fromFile)
+    PathBasedUrlBuilder(String absolute) {
+        this.absolute = absolute
+        def fromFilePath = Path.of(absolute)
         if (fromFilePath.parent) {
             this.fromDirectory = fromFilePath.parent
         } else {
@@ -15,6 +17,11 @@ class PathBasedUrlBuilder implements UrlBuilder {
         }
     }
 
+    @Override
+    String getAbsolute() {
+        this.absolute
+    }
+
     @Override
     String relative(String to) {
         this.fromDirectory.relativize(Path.of(to)).toString()
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
index d7a2a26..fdcf087 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.url
 
 interface UrlBuilder {
+    String getAbsolute()
     String relative(String to)
 }
\ No newline at end of file
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
index 4381779..d05e6fd 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
@@ -3,8 +3,8 @@ package com.jessebrault.ssg.url
 class PathBasedUrlBuilderTests extends AbstractUrlBuilderTests {
 
     @Override
-    protected UrlBuilder getUrlBuilder(String fromFile) {
-        new PathBasedUrlBuilder(fromFile)
+    protected UrlBuilder getUrlBuilder(String targetPath) {
+        new PathBasedUrlBuilder(targetPath)
     }
 
 }
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
index ebbae9b..3fa352e 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
@@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals
 
 abstract class AbstractUrlBuilderTests {
 
-    protected abstract UrlBuilder getUrlBuilder(String fromFile);
+    protected abstract UrlBuilder getUrlBuilder(String targetPath);
 
     @Test
     void upDownDown() {
@@ -30,4 +30,12 @@ abstract class AbstractUrlBuilderTests {
         )
     }
 
+    @Test
+    void absoluteMatchesTargetPath() {
+        assertEquals(
+                'test/test.html',
+                this.getUrlBuilder('test/test.html').absolute
+        )
+    }
+
 }

From 111bdea286249e02efaca01fd681807e01094e04 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Wed, 15 Feb 2023 16:13:20 +0100
Subject: [PATCH 21/36] SiteSpec proliferated.

---
 .../ssg/AbstractBuildCommand.groovy           | 12 ++-
 .../groovy/com/jessebrault/ssg/Build.groovy   |  4 +-
 .../ssg/SimpleStaticSiteGenerator.groovy      |  3 +
 .../com/jessebrault/ssg/SiteSpec.groovy       | 27 ++++++
 .../buildscript/BuildClosureDelegate.groovy   | 15 ++-
 .../ssg/buildscript/BuildScriptBase.groovy    | 11 ++-
 .../SiteSpecClosureDelegate.groovy            | 14 +++
 .../ssg/part/EmbeddablePart.groovy            |  3 +
 .../ssg/part/EmbeddablePartsMap.groovy        |  7 +-
 .../ssg/part/GspPartRenderer.groovy           |  7 +-
 .../jessebrault/ssg/part/PartRenderer.groovy  |  2 +
 .../specialpage/GspSpecialPageRenderer.groovy | 15 ++-
 .../specialpage/SpecialPageRenderer.groovy    |  2 +
 .../ssg/template/GspTemplateRenderer.groovy   |  6 +-
 .../ssg/template/TemplateRenderer.groovy      |  2 +
 .../ssg/url/PathBasedUrlBuilder.groovy        |  6 +-
 ...StaticSiteGeneratorIntegrationTests.groovy |  3 +-
 .../ssg/part/GspPartRendererTests.groovy      | 10 ++
 .../GspSpecialPageRendererTests.groovy        | 91 ++++++++++++++++---
 .../template/GspTemplateRendererTests.groovy  | 42 ++++++++-
 .../ssg/url/PathBasedUrlBuilderTests.groovy   |  4 +-
 .../ssg/url/AbstractUrlBuilderTests.groovy    | 12 +--
 22 files changed, 259 insertions(+), 39 deletions(-)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/buildscript/SiteSpecClosureDelegate.groovy

diff --git a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
index dba4ed5..d3cce49 100644
--- a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
+++ b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
@@ -44,6 +44,10 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
                 partsProviders: [defaultPartsProvider],
                 specialPagesProviders: [defaultSpecialPagesProvider]
         )
+        def defaultSiteSpec = new SiteSpec(
+                name: '',
+                baseUrl: ''
+        )
         def defaultGlobals = [:]
 
         // Run build script, if applicable
@@ -56,7 +60,13 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
 
         if (this.builds.empty) {
             // Add default build
-            builds << new Build('default', defaultConfig, defaultGlobals, new File('build'))
+            builds << new Build(
+                    'default',
+                    defaultConfig,
+                    defaultSiteSpec,
+                    defaultGlobals,
+                    new File('build')
+            )
         }
 
         // Get ssg object
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/Build.groovy b/lib/src/main/groovy/com/jessebrault/ssg/Build.groovy
index c5d611a..d53e40c 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/Build.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/Build.groovy
@@ -11,12 +11,14 @@ class Build {
 
     String name
     Config config
+    SiteSpec siteSpec
     Map globals
     File outDir
 
     @Override
     String toString() {
-        "Build(name: ${ this.name }, config: ${ this.config }, globals: ${ this.globals }, outDir: ${ this.outDir })"
+        "Build(name: ${ this.name }, config: ${ this.config }, siteSpec: ${ this.siteSpec }, " +
+                "globals: ${ this.globals }, outDir: ${ this.outDir })"
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
index c357c2e..97bd00b 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
@@ -27,6 +27,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
         logger.info('processing build with name: {}', build.name)
 
         def config = build.config
+        def siteSpec = build.siteSpec
 
         // Get all texts, templates, parts, and specialPages
         def texts = config.textProviders.collectMany { it.provide() }
@@ -80,6 +81,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
                     frontMatter,
                     it,
                     parts,
+                    siteSpec,
                     globals,
                     targetPath
             )
@@ -105,6 +107,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
                     it,
                     texts,
                     parts,
+                    siteSpec,
                     globals,
                     targetPath
             )
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy
new file mode 100644
index 0000000..37a8835
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy
@@ -0,0 +1,27 @@
+package com.jessebrault.ssg
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.MapConstructor
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(force = true, defaults = false)
+@MapConstructor
+@NullCheck
+@EqualsAndHashCode
+final class SiteSpec {
+
+    String name
+    String baseUrl
+
+    SiteSpec(SiteSpec source) {
+        this.name = source.name
+        this.baseUrl = source.baseUrl
+    }
+
+    @Override
+    String toString() {
+        "SiteSpec(${ this.name }, ${ this.baseUrl })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildClosureDelegate.groovy b/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildClosureDelegate.groovy
index 6572ee3..cc24ef2 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildClosureDelegate.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildClosureDelegate.groovy
@@ -1,26 +1,37 @@
 package com.jessebrault.ssg.buildscript
 
 import com.jessebrault.ssg.Config
+import com.jessebrault.ssg.SiteSpec
 
 class BuildClosureDelegate {
 
     String name
     Config config
+    SiteSpec siteSpec
     Map globals
     File outDir
 
     void config(
             @DelegatesTo(value = ConfigClosureDelegate, strategy = Closure.DELEGATE_FIRST)
-                    Closure configClosure
+            Closure configClosure
     ) {
         configClosure.setDelegate(new ConfigClosureDelegate(this.config))
         configClosure.setResolveStrategy(Closure.DELEGATE_FIRST)
         configClosure.run()
     }
 
+    void siteSpec(
+            @DelegatesTo(value = SiteSpecClosureDelegate, strategy = Closure.DELEGATE_FIRST)
+            Closure siteSpecClosure
+    ) {
+        siteSpecClosure.setDelegate(new SiteSpecClosureDelegate(this.siteSpec))
+        siteSpecClosure.setResolveStrategy(Closure.DELEGATE_FIRST)
+        siteSpecClosure.run()
+    }
+
     void globals(
             @DelegatesTo(value = GlobalsClosureDelegate, strategy = Closure.DELEGATE_FIRST)
-                    Closure globalsClosure
+            Closure globalsClosure
     ) {
         def globalsConfigurator = new GlobalsClosureDelegate(this.globals)
         globalsClosure.setDelegate(globalsConfigurator)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy b/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy
index 10907fa..3c9a84d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy
@@ -2,10 +2,12 @@ package com.jessebrault.ssg.buildscript
 
 import com.jessebrault.ssg.Build
 import com.jessebrault.ssg.Config
+import com.jessebrault.ssg.SiteSpec
 
 abstract class BuildScriptBase extends Script {
 
     Config defaultConfig
+    SiteSpec defaultSiteSpec
     Map defaultGlobals
 
     Collection<Build> builds = []
@@ -20,13 +22,20 @@ abstract class BuildScriptBase extends Script {
             // Default values for Build properties
             name = 'build' + this.currentBuildNumber
             config = new Config(defaultConfig)
+            siteSpec = new SiteSpec(defaultSiteSpec)
             globals = new LinkedHashMap(defaultGlobals)
             outDir = new File(name)
         }
         buildClosure.setDelegate(buildClosureDelegate)
         buildClosure.setResolveStrategy(Closure.DELEGATE_FIRST)
         buildClosure.run()
-        this.builds << new Build(buildClosureDelegate.name, buildClosureDelegate.config, buildClosureDelegate.globals, buildClosureDelegate.outDir)
+        this.builds << new Build(
+                buildClosureDelegate.name,
+                buildClosureDelegate.config,
+                buildClosureDelegate.siteSpec,
+                buildClosureDelegate.globals,
+                buildClosureDelegate.outDir
+        )
         this.currentBuildNumber++
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/buildscript/SiteSpecClosureDelegate.groovy b/lib/src/main/groovy/com/jessebrault/ssg/buildscript/SiteSpecClosureDelegate.groovy
new file mode 100644
index 0000000..14a4e71
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/buildscript/SiteSpecClosureDelegate.groovy
@@ -0,0 +1,14 @@
+package com.jessebrault.ssg.buildscript
+
+import com.jessebrault.ssg.SiteSpec
+
+class SiteSpecClosureDelegate {
+
+    @Delegate
+    private final SiteSpec siteSpec
+
+    SiteSpecClosureDelegate(SiteSpec siteSpec) {
+        this.siteSpec = siteSpec
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
index d87e01b..1df64fa 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.part
 
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.text.EmbeddableText
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
@@ -12,6 +13,7 @@ import org.jetbrains.annotations.Nullable
 class EmbeddablePart {
 
     private final Part part
+    private final SiteSpec siteSpec
     private final Map globals
     private final Closure onDiagnostics
 
@@ -26,6 +28,7 @@ class EmbeddablePart {
         def result = part.type.renderer.render(
                 this.part,
                 binding,
+                this.siteSpec,
                 this.globals,
                 this.text,
                 this.allParts,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
index e867f95..1cd852d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.part
 
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.text.EmbeddableText
 import groovy.transform.EqualsAndHashCode
 import org.jetbrains.annotations.Nullable
@@ -12,6 +13,7 @@ class EmbeddablePartsMap {
 
     EmbeddablePartsMap(
             Collection<Part> parts,
+            SiteSpec siteSpec,
             Map globals,
             Closure onDiagnostics,
             @Nullable EmbeddableText text = null,
@@ -19,10 +21,13 @@ class EmbeddablePartsMap {
             String targetPath
     ) {
         Objects.requireNonNull(parts)
+        Objects.requireNonNull(siteSpec)
         Objects.requireNonNull(globals)
         Objects.requireNonNull(onDiagnostics)
+        Objects.requireNonNull(path)
+        Objects.requireNonNull(targetPath)
         parts.each {
-            this.put(it.path, new EmbeddablePart(it, globals, onDiagnostics, text, parts, path, targetPath))
+            this.put(it.path, new EmbeddablePart(it, siteSpec, globals, onDiagnostics, text, parts, path, targetPath))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index 3448efc..ac514a2 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -1,13 +1,13 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableText
 import com.jessebrault.ssg.url.PathBasedUrlBuilder
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
 import org.jetbrains.annotations.Nullable
 
 @EqualsAndHashCode
@@ -19,6 +19,7 @@ class GspPartRenderer implements PartRenderer {
     Tuple2<Collection<Diagnostic>, String> render(
             Part part,
             Map binding,
+            SiteSpec siteSpec,
             Map globals,
             @Nullable EmbeddableText text = null,
             Collection<Part> allParts,
@@ -27,6 +28,7 @@ class GspPartRenderer implements PartRenderer {
     ) {
         Objects.requireNonNull(part)
         Objects.requireNonNull(binding)
+        Objects.requireNonNull(siteSpec)
         Objects.requireNonNull(globals)
         Objects.requireNonNull(allParts)
         Objects.requireNonNull(path)
@@ -38,6 +40,7 @@ class GspPartRenderer implements PartRenderer {
                     globals: globals,
                     parts: new EmbeddablePartsMap(
                             allParts,
+                            siteSpec,
                             globals,
                             embeddedPartDiagnostics.&addAll,
                             text,
@@ -48,7 +51,7 @@ class GspPartRenderer implements PartRenderer {
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
                     text: text,
-                    urlBuilder: new PathBasedUrlBuilder(targetPath)
+                    urlBuilder: new PathBasedUrlBuilder(targetPath, siteSpec.baseUrl)
             ])
             new Tuple2<>([], result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
index 70fe1a8..4a281ae 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.text.EmbeddableText
 import org.jetbrains.annotations.Nullable
 
@@ -9,6 +10,7 @@ interface PartRenderer {
     Tuple2<Collection<Diagnostic>, String> render(
             Part part,
             Map binding,
+            SiteSpec siteSpec,
             Map globals,
             @Nullable EmbeddableText text,
             Collection<Part> allParts,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index 2a01dd9..e72762a 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -1,8 +1,9 @@
 package com.jessebrault.ssg.specialpage
 
 import com.jessebrault.ssg.Diagnostic
-import com.jessebrault.ssg.part.Part
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.EmbeddablePartsMap
+import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableTextsCollection
 import com.jessebrault.ssg.text.Text
@@ -23,6 +24,7 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
             SpecialPage specialPage,
             Collection<Text> texts,
             Collection<Part> parts,
+            SiteSpec siteSpec,
             Map globals,
             String targetPath
     ) {
@@ -30,12 +32,19 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
             Collection<Diagnostic> diagnostics = []
             def result = engine.createTemplate(specialPage.text).make([
                     globals: globals,
-                    parts: new EmbeddablePartsMap(parts, globals, diagnostics.&addAll, specialPage.path, targetPath),
+                    parts: new EmbeddablePartsMap(
+                            parts,
+                            siteSpec,
+                            globals,
+                            diagnostics.&addAll,
+                            specialPage.path,
+                            targetPath
+                    ),
                     path: specialPage.path,
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
                     texts: new EmbeddableTextsCollection(texts, globals, diagnostics.&addAll),
-                    urlBuilder: new PathBasedUrlBuilder(targetPath)
+                    urlBuilder: new PathBasedUrlBuilder(targetPath, siteSpec.baseUrl)
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
index c597100..842267c 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg.specialpage
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.text.Text
 
@@ -10,6 +11,7 @@ interface SpecialPageRenderer {
             SpecialPage specialPage,
             Collection<Text> texts,
             Collection <Part> parts,
+            SiteSpec siteSpec,
             Map globals,
             String targetPath
     )
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index 6bcb15c..8bfee53 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg.template
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.EmbeddablePartsMap
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
@@ -26,6 +27,7 @@ class GspTemplateRenderer implements TemplateRenderer {
             FrontMatter frontMatter,
             Text text,
             Collection<Part> parts,
+            SiteSpec siteSpec,
             Map globals,
             String targetPath
     ) {
@@ -38,12 +40,12 @@ class GspTemplateRenderer implements TemplateRenderer {
             def result = engine.createTemplate(template.text).make([
                     frontMatter: frontMatter,
                     globals: globals,
-                    parts: new EmbeddablePartsMap(parts, globals, onDiagnostics, embeddableText, text.path, targetPath),
+                    parts: new EmbeddablePartsMap(parts, siteSpec, globals, onDiagnostics, embeddableText, text.path, targetPath),
                     path: text.path,
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
                     text: embeddableText,
-                    urlBuilder: new PathBasedUrlBuilder(targetPath)
+                    urlBuilder: new PathBasedUrlBuilder(targetPath, siteSpec.baseUrl)
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
index 71b97fe..986fe26 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg.template
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.text.FrontMatter
 import com.jessebrault.ssg.text.Text
@@ -16,6 +17,7 @@ interface TemplateRenderer {
             FrontMatter frontMatter,
             Text text,
             Collection<Part> parts,
+            SiteSpec siteSpec,
             Map globals,
             String targetPath
     )
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
index 4050712..c3a4962 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
@@ -7,9 +7,9 @@ class PathBasedUrlBuilder implements UrlBuilder {
     private final String absolute
     private final Path fromDirectory
 
-    PathBasedUrlBuilder(String absolute) {
-        this.absolute = absolute
-        def fromFilePath = Path.of(absolute)
+    PathBasedUrlBuilder(String targetPath, String baseUrl) {
+        this.absolute = baseUrl + '/' + targetPath
+        def fromFilePath = Path.of(targetPath)
         if (fromFilePath.parent) {
             this.fromDirectory = fromFilePath.parent
         } else {
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
index 2a009b1..5195786 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
@@ -53,9 +53,10 @@ class SimpleStaticSiteGeneratorIntegrationTests {
                 partsProviders: [partsProvider],
                 specialPagesProviders: [specialPagesProvider]
         )
+        def siteSpec = new SiteSpec('Test Site', 'https://test.com')
         def globals = [:]
 
-        this.build = new Build('testBuild', config, globals, new File('build'))
+        this.build = new Build('testBuild', config, siteSpec, globals, new File('build'))
         this.ssg = new SimpleStaticSiteGenerator()
     }
 
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index c48fb5d..2339478 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.part
 
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.text.EmbeddableText
 import org.junit.jupiter.api.Test
 
@@ -19,6 +20,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [:],
+                new SiteSpec('', ''),
                 [:],
                 null,
                 [part],
@@ -35,6 +37,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [greeting: 'Hello, World!'],
+                new SiteSpec('', ''),
                 [:],
                 null,
                 [part],
@@ -51,6 +54,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [:],
+                new SiteSpec('', ''),
                 [greeting: 'Hello, World!'],
                 null,
                 [part],
@@ -68,6 +72,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [:],
+                new SiteSpec('', ''),
                 [:],
                 new EmbeddableText(renderableText('Hello, World!'), [:], textDiagnostics.&addAll),
                 [part],
@@ -85,6 +90,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [:],
+                new SiteSpec('', ''),
                 [:],
                 null,
                 [part],
@@ -103,6 +109,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part0,
                 [:],
+                new SiteSpec('', ''),
                 [:],
                 null,
                 [part0, part1],
@@ -119,6 +126,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [:],
+                new SiteSpec('', ''),
                 [:],
                 null,
                 [part],
@@ -135,6 +143,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [:],
+                new SiteSpec('', ''),
                 [:],
                 null,
                 [part],
@@ -151,6 +160,7 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 part,
                 [:],
+                new SiteSpec('', ''),
                 [:],
                 null,
                 [part],
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index 1329e52..8570145 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.specialpage
 
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.part.PartRenderer
 import com.jessebrault.ssg.part.PartType
@@ -24,20 +25,34 @@ class GspSpecialPageRendererTests {
     void rendersGlobal() {
         def specialPage = new SpecialPage("<%= globals['greeting'] %>", 'test.gsp', null)
         def globals = [greeting: 'Hello, World!']
-        def r = this.renderer.render(specialPage, [], [], globals, '')
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [],
+                new SiteSpec('', ''),
+                globals,
+                ''
+        )
         assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
 
     @Test
     void rendersPartWithNoBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any()))
+        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any(), any()))
                 .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType , '')
 
         def specialPage = new SpecialPage("<%= parts['test'].render() %>", 'test.gsp', null)
-        def r = this.renderer.render(specialPage, [], [part], [:], '')
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [part],
+                new SiteSpec('', ''),
+                [:],
+                ''
+        )
         assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
@@ -45,7 +60,14 @@ class GspSpecialPageRendererTests {
     @Test
     void rendersPartWithBinding(@Mock PartRenderer partRenderer) {
         when(partRenderer.render(
-                any(), argThat { Map m -> m.get('greeting') == 'Hello, World!'}, any(), any(), any(), any(), any()
+                any(),
+                argThat { Map m -> m.get('greeting') == 'Hello, World!'},
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                any()
         )).thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, '')
@@ -55,7 +77,14 @@ class GspSpecialPageRendererTests {
                 'test.gsp',
                 null
         )
-        def r = this.renderer.render(specialPage, [], [part], [:], '')
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [part],
+                new SiteSpec('', ''),
+                [:],
+                ''
+        )
         assertEmptyDiagnostics(r)
         assertEquals('Hello, World!', r.v2)
     }
@@ -72,7 +101,14 @@ class GspSpecialPageRendererTests {
                 'test.gsp',
                 null
         )
-        def r = this.renderer.render(specialPage, [text], [], [:], '')
+        def r = this.renderer.render(
+                specialPage,
+                [text],
+                [],
+                new SiteSpec('', ''),
+                [:],
+                ''
+        )
         assertEmptyDiagnostics(r)
         assertEquals('<p><strong>Hello, World!</strong></p>\n', r.v2)
     }
@@ -80,7 +116,14 @@ class GspSpecialPageRendererTests {
     @Test
     void tagBuilderAvailable() {
         def specialPage = new SpecialPage('<%= tagBuilder.test() %>', 'test.gsp', null)
-        def r = this.renderer.render(specialPage, [], [], [:], '')
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [],
+                new SiteSpec('', ''),
+                [:],
+                ''
+        )
         assertEmptyDiagnostics(r)
         assertEquals('<test />', r.v2)
     }
@@ -88,7 +131,14 @@ class GspSpecialPageRendererTests {
     @Test
     void pathAvailable() {
         def specialPage = new SpecialPage('<%= path %>', 'test.gsp', null)
-        def r = this.renderer.render(specialPage, [], [], [:], '')
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [],
+                new SiteSpec('', ''),
+                [:],
+                ''
+        )
         assertEmptyDiagnostics(r)
         assertEquals('test.gsp', r.v2)
     }
@@ -100,7 +150,14 @@ class GspSpecialPageRendererTests {
                 'test.gsp',
                 null
         )
-        def r = this.renderer.render(specialPage, [], [], [:], 'test.html')
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [],
+                new SiteSpec('', ''),
+                [:],
+                'test.html'
+        )
         assertEmptyDiagnostics(r)
         assertEquals('images/test.jpg', r.v2)
     }
@@ -113,7 +170,12 @@ class GspSpecialPageRendererTests {
                 null
         )
         def r = this.renderer.render(
-                specialPage, [], [], [:], 'test/test.html'
+                specialPage,
+                [],
+                [],
+                new SiteSpec('', ''),
+                [:],
+                'test/test.html'
         )
         assertEmptyDiagnostics(r)
         assertEquals('../images/test.jpg', r.v2)
@@ -126,7 +188,14 @@ class GspSpecialPageRendererTests {
                 '',
                 null
         )
-        def r = this.renderer.render(specialPage, [], [], [:], 'test.html')
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [],
+                new SiteSpec('', ''),
+                [:],
+                'test.html'
+        )
         assertEmptyDiagnostics(r)
         assertEquals('test.html', r.v2)
     }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index 8efe40d..7438b34 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -1,5 +1,6 @@
 package com.jessebrault.ssg.template
 
+import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.Part
 import com.jessebrault.ssg.part.PartRenderer
 import com.jessebrault.ssg.part.PartType
@@ -31,7 +32,7 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any()))
+        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any(), any()))
                 .thenReturn(new Tuple2<>([], 'Hello, World!'))
         def partType = new PartType([], partRenderer)
         def part = new Part('test', partType, null)
@@ -41,6 +42,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [part],
+                new SiteSpec('', ''),
                 [:],
                 ''
         )
@@ -56,8 +58,17 @@ class GspTemplateRendererTests {
                 null
         )
 
-        when(partRenderer.render(any(), argThat { Map m -> m.get('person') == 'World' }, any(), any(), any(), any(), any()))
-                .thenReturn(new Tuple2<>([], 'Hello, World!'))
+        when(partRenderer.render(
+                any(),
+                argThat { Map m -> m.get('person') == 'World' },
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                any()
+        )).thenReturn(new Tuple2<>([], 'Hello, World!'))
+
         def partType = new PartType([], partRenderer)
         def part = new Part('greeting', partType, null)
 
@@ -66,6 +77,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [part],
+                new SiteSpec('', ''),
                 [:],
                 ''
         )
@@ -81,6 +93,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [title: ['Hello!']]),
                 blankText(),
                 [],
+                new SiteSpec('', ''),
                 [:],
                 ''
         )
@@ -96,6 +109,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [],
+                new SiteSpec('', ''),
                 [test: 'Hello, World!'],
                 ''
         )
@@ -111,6 +125,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 renderableText('Hello, World!'),
                 [],
+                new SiteSpec('', ''),
                 [:],
                 ''
         )
@@ -126,6 +141,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [],
+                new SiteSpec('', ''),
                 [:],
                 ''
         )
@@ -141,6 +157,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 textWithPath('test.md'),
                 [],
+                new SiteSpec('', ''),
                 [:],
                 ''
         )
@@ -156,6 +173,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [],
+                new SiteSpec('', ''),
                 [:],
                 'test.html'
         )
@@ -171,6 +189,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [],
+                new SiteSpec('', ''),
                 [:],
                 'test/test.html'
         )
@@ -178,6 +197,22 @@ class GspTemplateRendererTests {
         assertEquals('../images/test.jpg', r.v2)
     }
 
+    @Test
+    void urlBuilderAbsolutePathCorrect() {
+        def template = new Template('<%= urlBuilder.absolute %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                blankText(),
+                [],
+                new SiteSpec('', 'https://test.com'),
+                [:],
+                'test/test.html'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('https://test.com/test/test.html', r.v2)
+    }
+
     @Test
     void targetPathAvailable() {
         def template = new Template('<%= targetPath %>', null, null)
@@ -186,6 +221,7 @@ class GspTemplateRendererTests {
                 new FrontMatter(null, [:]),
                 blankText(),
                 [],
+                new SiteSpec('', ''),
                 [:],
                 'test.html'
         )
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
index d05e6fd..4b56f50 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilderTests.groovy
@@ -3,8 +3,8 @@ package com.jessebrault.ssg.url
 class PathBasedUrlBuilderTests extends AbstractUrlBuilderTests {
 
     @Override
-    protected UrlBuilder getUrlBuilder(String targetPath) {
-        new PathBasedUrlBuilder(targetPath)
+    protected UrlBuilder getUrlBuilder(String targetPath, String baseUrl) {
+        new PathBasedUrlBuilder(targetPath, baseUrl)
     }
 
 }
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
index 3fa352e..73fd64b 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
@@ -6,11 +6,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals
 
 abstract class AbstractUrlBuilderTests {
 
-    protected abstract UrlBuilder getUrlBuilder(String targetPath);
+    protected abstract UrlBuilder getUrlBuilder(String targetPath, String baseUrl);
 
     @Test
     void upDownDown() {
-        def builder = this.getUrlBuilder('posts/post.html')
+        def builder = this.getUrlBuilder('posts/post.html', '')
         assertEquals('../images/test.jpg', builder.relative('images/test.jpg'))
     }
 
@@ -18,7 +18,7 @@ abstract class AbstractUrlBuilderTests {
     void downDown() {
         assertEquals(
                 'images/test.jpg',
-                this.getUrlBuilder('test.html').relative('images/test.jpg')
+                this.getUrlBuilder('test.html', '').relative('images/test.jpg')
         )
     }
 
@@ -26,15 +26,15 @@ abstract class AbstractUrlBuilderTests {
     void upUpDownDown() {
         assertEquals(
                 '../../images/test.jpg',
-                this.getUrlBuilder('posts/old/test.html').relative('images/test.jpg')
+                this.getUrlBuilder('posts/old/test.html', '').relative('images/test.jpg')
         )
     }
 
     @Test
     void absoluteMatchesTargetPath() {
         assertEquals(
-                'test/test.html',
-                this.getUrlBuilder('test/test.html').absolute
+                'https://test.com/test/test.html',
+                this.getUrlBuilder('test/test.html', 'https://test.com').absolute
         )
     }
 

From 60f4c1415fad2f46219587e9dc6641851cd75e03 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Thu, 16 Feb 2023 08:47:35 +0100
Subject: [PATCH 22/36] UrlBuilder has absolute(to) method.

---
 .../com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy    | 7 +++++++
 .../main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy | 1 +
 .../jessebrault/ssg/url/AbstractUrlBuilderTests.groovy    | 8 ++++++++
 3 files changed, 16 insertions(+)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
index c3a4962..76ffb5d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy
@@ -5,10 +5,12 @@ import java.nio.file.Path
 class PathBasedUrlBuilder implements UrlBuilder {
 
     private final String absolute
+    private final String baseUrl
     private final Path fromDirectory
 
     PathBasedUrlBuilder(String targetPath, String baseUrl) {
         this.absolute = baseUrl + '/' + targetPath
+        this.baseUrl = baseUrl
         def fromFilePath = Path.of(targetPath)
         if (fromFilePath.parent) {
             this.fromDirectory = fromFilePath.parent
@@ -22,6 +24,11 @@ class PathBasedUrlBuilder implements UrlBuilder {
         this.absolute
     }
 
+    @Override
+    String absolute(String to) {
+        this.baseUrl + '/' + to
+    }
+
     @Override
     String relative(String to) {
         this.fromDirectory.relativize(Path.of(to)).toString()
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy b/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
index fdcf087..9991136 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy
@@ -2,5 +2,6 @@ package com.jessebrault.ssg.url
 
 interface UrlBuilder {
     String getAbsolute()
+    String absolute(String to)
     String relative(String to)
 }
\ No newline at end of file
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
index 73fd64b..402d471 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/url/AbstractUrlBuilderTests.groovy
@@ -38,4 +38,12 @@ abstract class AbstractUrlBuilderTests {
         )
     }
 
+    @Test
+    void absoluteToCorrect() {
+        assertEquals(
+                'https://test.com/images/test.jpg',
+                this.getUrlBuilder('', 'https://test.com').absolute('images/test.jpg')
+        )
+    }
+
 }

From ef9e5669e330f304f9921ae762d94283a02167b4 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Thu, 16 Feb 2023 09:10:54 +0100
Subject: [PATCH 23/36] SiteSpec in dsl.

---
 .../ssg/part/GspPartRenderer.groovy           |  1 +
 .../specialpage/GspSpecialPageRenderer.groovy |  1 +
 .../ssg/template/GspTemplateRenderer.groovy   |  1 +
 .../ssg/part/GspPartRendererTests.groovy      | 17 +++++++++++++++++
 .../GspSpecialPageRendererTests.groovy        | 19 +++++++++++++++++++
 .../template/GspTemplateRendererTests.groovy  | 16 ++++++++++++++++
 6 files changed, 55 insertions(+)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index ac514a2..a7f5e52 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -48,6 +48,7 @@ class GspPartRenderer implements PartRenderer {
                             targetPath
                     ),
                     path: path,
+                    siteSpec: siteSpec,
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
                     text: text,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index e72762a..3060bb3 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -41,6 +41,7 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
                             targetPath
                     ),
                     path: specialPage.path,
+                    siteSpec: siteSpec,
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
                     texts: new EmbeddableTextsCollection(texts, globals, diagnostics.&addAll),
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index 8bfee53..bf0ffae 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -42,6 +42,7 @@ class GspTemplateRenderer implements TemplateRenderer {
                     globals: globals,
                     parts: new EmbeddablePartsMap(parts, siteSpec, globals, onDiagnostics, embeddableText, text.path, targetPath),
                     path: text.path,
+                    siteSpec: siteSpec,
                     tagBuilder: new DynamicTagBuilder(),
                     targetPath: targetPath,
                     text: embeddableText,
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index 2339478..6b346d9 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -171,4 +171,21 @@ class GspPartRendererTests {
         assertEquals('test/test.html', r.v2)
     }
 
+    @Test
+    void siteSpecBaseUrlAvailable() {
+        def part = new Part('', null, '<%= siteSpec.baseUrl %>')
+        def r = this.renderer.render(
+                part,
+                [:],
+                new SiteSpec('', 'https://test.com'),
+                [:],
+                null,
+                [part],
+                '',
+                ''
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('https://test.com', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index 8570145..2b684bd 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -200,4 +200,23 @@ class GspSpecialPageRendererTests {
         assertEquals('test.html', r.v2)
     }
 
+    @Test
+    void siteSpecBaseUrlAvailable() {
+        def specialPage = new SpecialPage(
+                '<%= siteSpec.baseUrl %>',
+                '',
+                null
+        )
+        def r = this.renderer.render(
+                specialPage,
+                [],
+                [],
+                new SiteSpec('', 'https://test.com'),
+                [:],
+                ''
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('https://test.com', r.v2)
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index 7438b34..9433a7d 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -229,4 +229,20 @@ class GspTemplateRendererTests {
         assertEquals('test.html', r.v2)
     }
 
+    @Test
+    void siteSpecBaseUrlAvailable() {
+        def template = new Template('<%= siteSpec.baseUrl %>', null, null)
+        def r = this.renderer.render(
+                template,
+                new FrontMatter(null, [:]),
+                blankText(),
+                [],
+                new SiteSpec('', 'https://test.com'),
+                [:],
+                'test.html'
+        )
+        assertEmptyDiagnostics(r)
+        assertEquals('https://test.com', r.v2)
+    }
+
 }

From d252d504db69625ecc4cf1221b1ac8f572f46d9f Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Thu, 16 Feb 2023 09:15:26 +0100
Subject: [PATCH 24/36] Update CHANGELOG.md

---
 CHANGELOG.md | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1becaf1..ce6bfa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
+- There is now the notion of a `siteSpec`, an object of type of [`SiteSpec`](lib/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy). It is simmilar to the `globals` object in that it contains properties that are available in all Templates, SpecialPages, and Parts. Unlike `globals`, which contains user-defined keys, `siteSpec` contains (for now) the pre-defined keys `baseUrl` and `title`. To configure the `siteSpec`, add the following block to a `build` block in `ssgBuilds.groovy`:
+    ```groovy
+    siteSpec {
+        baseUrl = 'https://test.com' // or whatever, defaults to an empty string
+        title = 'My Great Website' // or whatever, defaults to an empty string
+    }
+    ```
+  Then use it in any Template, SpecialPage, or part like so:
+  ```gsp
+  <%
+      assert siteSpec.baseUrl == 'https://test.com' && siteSpec.title == 'My Great Website'
+  %>
+  ```
+  [111bdea](https://github.com/JesseBrault0709/ssg/commit/111bdea), [ef9e566](https://github.com/JesseBrault0709/ssg/commit/ef9e566).
 - Templates, SpecialPages, and Parts all have access to `targetPath` of type `String` representing the path of the 'output' file. For now, this is always a `.html` file.
     ```gsp
     <%
@@ -39,17 +53,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
     %>
     ```
   [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41), [9983685](https://github.com/JesseBrault0709/ssg/commit/9983685), [076bc9b](https://github.com/JesseBrault0709/ssg/commit/076bc9b).
-- Templates, SpecialPages, and Parts all have access to a `urlBuilder` of type [`PathBasedUrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy) (implementing [`UrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy)). Use it like so:
+- Templates, SpecialPages, and Parts all have access to a `urlBuilder` of type [`PathBasedUrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy) (implementing [`UrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy)). It can be used to obtain both absolute (using `siteSpec.baseUrl`) and relative urls (to the current `targetPath`). Use it like so:
     ```gsp
     <%
-        // when targetPath == 'nested/post.html'
-        assert urlBuilder.relative('images/test.jpg') == '../images/test.jpg'
-    
         // when targetPath == 'simple.html'
         assert urlBuilder.relative('images/test.jpg') == 'images/test.jpg'
+        
+        // when targetPath == 'nested/post.html'
+        assert urlBuilder.relative('images/test.jpg') == '../images/test.jpg'
+        
+        // when baseUrl is 'https://test.com' and targetPath is 'simple.html'
+        assert urlBuilder.absolute == 'https://test.com/simple.html
+        
+        // when baseUrl is 'https://test.com' and we want an absolute to another file
+        assert urlBuilder.absolute('images/test.jpg') == 'https://test.com/images/test.jpg'
     %>
     ```
-  *Nota bene:* likely will break on Windows since `PathBasedUrlBuilder` currently uses Java's `Path` api and paths would be thusly rendered using Windows-style backslashes. This will be explored in the future. [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41).
+  *Nota bene:* likely will break on Windows since `PathBasedUrlBuilder` currently uses Java's `Path` api and paths would be thusly rendered using Windows-style backslashes. This will be explored in the future. [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41), [0762dc6](https://github.com/JesseBrault0709/ssg/commit/0762dc6), [60f4c14](https://github.com/JesseBrault0709/ssg/commit/60f4c14).
 - Parts have access to all other parts now via `parts`, an object of type [`EmbeddablePartsMap`](lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy). For example:
 
     ```gsp

From 64f342a919ec8c7744ccd86703bf6435a88eb31d Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Thu, 16 Feb 2023 11:04:18 +0100
Subject: [PATCH 25/36] Added logger to dsl.

---
 buildSrc/src/main/groovy/ssg.common.gradle    |  4 +--
 .../ssg/part/GspPartRenderer.groovy           |  2 ++
 .../specialpage/GspSpecialPageRenderer.groovy |  2 ++
 .../ssg/template/GspTemplateRenderer.groovy   |  2 ++
 .../ssg/part/GspPartRendererTests.groovy      | 31 +++++++++++++++++++
 .../GspSpecialPageRendererTests.groovy        | 20 ++++++++++++
 .../template/GspTemplateRendererTests.groovy  | 26 ++++++++++++++++
 7 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/ssg.common.gradle b/buildSrc/src/main/groovy/ssg.common.gradle
index ce03827..5144520 100644
--- a/buildSrc/src/main/groovy/ssg.common.gradle
+++ b/buildSrc/src/main/groovy/ssg.common.gradle
@@ -38,10 +38,10 @@ dependencies {
      * Mockito
      */
     // https://mvnrepository.com/artifact/org.mockito/mockito-core
-    testFixturesApi 'org.mockito:mockito-core:4.11.0'
+    testFixturesApi 'org.mockito:mockito-core:5.1.1'
 
     // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
-    testFixturesApi 'org.mockito:mockito-junit-jupiter:4.11.0'
+    testFixturesApi 'org.mockito:mockito-junit-jupiter:5.1.1'
 
     /**
      * Test Logging
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index a7f5e52..79e1661 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -9,6 +9,7 @@ import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
 import org.jetbrains.annotations.Nullable
+import org.slf4j.LoggerFactory
 
 @EqualsAndHashCode
 class GspPartRenderer implements PartRenderer {
@@ -38,6 +39,7 @@ class GspPartRenderer implements PartRenderer {
             def result = engine.createTemplate(part.text).make([
                     binding: binding,
                     globals: globals,
+                    logger: LoggerFactory.getLogger("Part(${ part.path })"),
                     parts: new EmbeddablePartsMap(
                             allParts,
                             siteSpec,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index 3060bb3..b555d5d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -12,6 +12,7 @@ import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
+import org.slf4j.LoggerFactory
 
 @NullCheck
 @EqualsAndHashCode
@@ -32,6 +33,7 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
             Collection<Diagnostic> diagnostics = []
             def result = engine.createTemplate(specialPage.text).make([
                     globals: globals,
+                    logger: LoggerFactory.getLogger("SpecialPage(${ specialPage.path })"),
                     parts: new EmbeddablePartsMap(
                             parts,
                             siteSpec,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index bf0ffae..9f4f61f 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -13,6 +13,7 @@ import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
+import org.slf4j.LoggerFactory
 
 @NullCheck
 @EqualsAndHashCode
@@ -40,6 +41,7 @@ class GspTemplateRenderer implements TemplateRenderer {
             def result = engine.createTemplate(template.text).make([
                     frontMatter: frontMatter,
                     globals: globals,
+                    logger: LoggerFactory.getLogger("Template(${ template.path })"),
                     parts: new EmbeddablePartsMap(parts, siteSpec, globals, onDiagnostics, embeddableText, text.path, targetPath),
                     path: text.path,
                     siteSpec: siteSpec,
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index 6b346d9..068a4e8 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -3,13 +3,23 @@ package com.jessebrault.ssg.part
 import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.text.EmbeddableText
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.Mock
+import org.mockito.MockedStatic
+import org.mockito.junit.jupiter.MockitoExtension
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
 import static com.jessebrault.ssg.text.TextMocks.renderableText
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
+import static org.mockito.ArgumentMatchers.anyString
+import static org.mockito.Mockito.mockStatic
+import static org.mockito.Mockito.verify
 
+@ExtendWith(MockitoExtension)
 class GspPartRendererTests {
 
     private final PartRenderer renderer = new GspPartRenderer()
@@ -188,4 +198,25 @@ class GspPartRendererTests {
         assertEquals('https://test.com', r.v2)
     }
 
+    @Test
+    void loggerAvailable(@Mock Logger logger) {
+        try (MockedStatic<LoggerFactory> loggerFactory = mockStatic(LoggerFactory)) {
+            loggerFactory.when { LoggerFactory.getLogger(anyString()) }
+                    .thenReturn(logger)
+            def part = new Part('', null, '<% logger.info "Hello, World!" %>')
+            def r = this.renderer.render(
+                    part,
+                    [:],
+                    new SiteSpec('', ''),
+                    [:],
+                    null,
+                    [part],
+                    '',
+                    ''
+            )
+            assertEmptyDiagnostics(r)
+            verify(logger).info('Hello, World!')
+        }
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index 2b684bd..993c787 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -8,12 +8,18 @@ import com.jessebrault.ssg.text.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
+import org.mockito.MockedStatic
 import org.mockito.junit.jupiter.MockitoExtension
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.mockito.ArgumentMatchers.any
+import static org.mockito.ArgumentMatchers.anyString
 import static org.mockito.ArgumentMatchers.argThat
+import static org.mockito.Mockito.mockStatic
+import static org.mockito.Mockito.verify
 import static org.mockito.Mockito.when
 
 @ExtendWith(MockitoExtension)
@@ -219,4 +225,18 @@ class GspSpecialPageRendererTests {
         assertEquals('https://test.com', r.v2)
     }
 
+    @Test
+    void loggerAvailable(@Mock Logger logger) {
+        try (MockedStatic<LoggerFactory> loggerFactory = mockStatic(LoggerFactory)) {
+            loggerFactory.when { LoggerFactory.getLogger(anyString()) }
+                    .thenReturn(logger)
+            def specialPage = new SpecialPage('<% logger.info "Hello, World!" %>', '', null)
+            def r = this.renderer.render(
+                    specialPage, [], [], new SiteSpec('', ''), [:], ''
+            )
+            assertEmptyDiagnostics(r)
+            verify(logger).info('Hello, World!')
+        }
+    }
+
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index 9433a7d..d24de67 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -8,7 +8,10 @@ import com.jessebrault.ssg.text.FrontMatter
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
+import org.mockito.MockedStatic
 import org.mockito.junit.jupiter.MockitoExtension
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
@@ -16,7 +19,10 @@ import static com.jessebrault.ssg.text.TextMocks.*
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
 import static org.mockito.ArgumentMatchers.any
+import static org.mockito.ArgumentMatchers.anyString
 import static org.mockito.ArgumentMatchers.argThat
+import static org.mockito.Mockito.mockStatic
+import static org.mockito.Mockito.verify
 import static org.mockito.Mockito.when
 
 @ExtendWith(MockitoExtension)
@@ -245,4 +251,24 @@ class GspTemplateRendererTests {
         assertEquals('https://test.com', r.v2)
     }
 
+    @Test
+    void loggerAvailable(@Mock Logger logger) {
+        try (MockedStatic<LoggerFactory> loggerFactory = mockStatic(LoggerFactory)) {
+            loggerFactory.when(() -> LoggerFactory.getLogger(anyString()))
+                    .thenReturn(logger)
+            def template = new Template('<% logger.info "Hello, World!" %>', null, null)
+            def r = this.renderer.render(
+                    template,
+                    new FrontMatter(null, [:]),
+                    blankText(),
+                    [],
+                    new SiteSpec('', ''),
+                    [:],
+                    ''
+            )
+            assertEmptyDiagnostics(r)
+            verify(logger).info('Hello, World!')
+        }
+    }
+
 }

From a6264eb823a82995ccb71da791f4496c445c666d Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Thu, 16 Feb 2023 11:07:07 +0100
Subject: [PATCH 26/36] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce6bfa0..7cb1753 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
+- Templates, SpecialPages, and Parts all have access to a `logger` of type `org.slf4j.Logger`. [64f342a](https://github.com/JesseBrault0709/ssg/commit/64f342a).
 - There is now the notion of a `siteSpec`, an object of type of [`SiteSpec`](lib/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy). It is simmilar to the `globals` object in that it contains properties that are available in all Templates, SpecialPages, and Parts. Unlike `globals`, which contains user-defined keys, `siteSpec` contains (for now) the pre-defined keys `baseUrl` and `title`. To configure the `siteSpec`, add the following block to a `build` block in `ssgBuilds.groovy`:
     ```groovy
     siteSpec {

From c958cf1427bd94cece6a4854a3209fbae008783e Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Thu, 16 Feb 2023 13:53:50 +0100
Subject: [PATCH 27/36] Nested Part exceptions should bubble up.

---
 .../ssg/part/GspPartRenderer.groovy           | 11 ++--
 .../specialpage/GspSpecialPageRenderer.groovy |  4 +-
 .../ssg/template/GspTemplateRenderer.groovy   | 11 ++--
 .../ssg/part/GspPartRendererTests.groovy      | 52 +++++++++++++++++++
 .../ssg/testutil/DiagnosticsUtil.groovy       |  8 +++
 5 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index 79e1661..d3bd1dd 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -56,14 +56,13 @@ class GspPartRenderer implements PartRenderer {
                     text: text,
                     urlBuilder: new PathBasedUrlBuilder(targetPath, siteSpec.baseUrl)
             ])
-            new Tuple2<>([], result.toString())
+            new Tuple2<>(embeddedPartDiagnostics, result.toString())
         } catch (Exception e) {
-            def diagnostic = new Diagnostic(
-                    "An exception occurred while rendering part ${ part.path }:\n${ e }",
-                    e
-            )
             new Tuple2<>(
-                    [diagnostic, *embeddedPartDiagnostics],
+                    [*embeddedPartDiagnostics, new Diagnostic(
+                            "An exception occurred while rendering part ${ part.path }:\n${ e }",
+                            e
+                    )],
                     ''
             )
         }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index b555d5d..9b78a70 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -29,8 +29,8 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
             Map globals,
             String targetPath
     ) {
+        Collection<Diagnostic> diagnostics = []
         try {
-            Collection<Diagnostic> diagnostics = []
             def result = engine.createTemplate(specialPage.text).make([
                     globals: globals,
                     logger: LoggerFactory.getLogger("SpecialPage(${ specialPage.path })"),
@@ -51,7 +51,7 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
-            new Tuple2<>([new Diagnostic("An exception occurred while rendering specialPage ${ specialPage.path }:\n${ e }", e)], '')
+            new Tuple2<>([*diagnostics, new Diagnostic("An exception occurred while rendering specialPage ${ specialPage.path }:\n${ e }", e)], '')
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index 9f4f61f..997bbce 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -32,17 +32,14 @@ class GspTemplateRenderer implements TemplateRenderer {
             Map globals,
             String targetPath
     ) {
+        def diagnostics = []
         try {
-            Collection<Diagnostic> diagnostics = []
-            def onDiagnostics = { Collection<Diagnostic> partDiagnostics ->
-                diagnostics.addAll(partDiagnostics)
-            }
-            def embeddableText = new EmbeddableText(text, globals, onDiagnostics)
+            def embeddableText = new EmbeddableText(text, globals, diagnostics.&addAll)
             def result = engine.createTemplate(template.text).make([
                     frontMatter: frontMatter,
                     globals: globals,
                     logger: LoggerFactory.getLogger("Template(${ template.path })"),
-                    parts: new EmbeddablePartsMap(parts, siteSpec, globals, onDiagnostics, embeddableText, text.path, targetPath),
+                    parts: new EmbeddablePartsMap(parts, siteSpec, globals, diagnostics.&addAll, embeddableText, text.path, targetPath),
                     path: text.path,
                     siteSpec: siteSpec,
                     tagBuilder: new DynamicTagBuilder(),
@@ -52,7 +49,7 @@ class GspTemplateRenderer implements TemplateRenderer {
             ])
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
-            new Tuple2<>([new Diagnostic("An exception occurred while rendering Template ${ template.path }:\n${ e }", e)], '')
+            new Tuple2<>([*diagnostics, new Diagnostic("An exception occurred while rendering Template ${ template.path }:\n${ e }", e)], '')
         }
     }
 
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index 068a4e8..833671a 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -10,10 +10,12 @@ import org.mockito.junit.jupiter.MockitoExtension
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertDiagnosticException
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
 import static com.jessebrault.ssg.text.TextMocks.renderableText
 import static org.junit.jupiter.api.Assertions.assertEquals
+import static org.junit.jupiter.api.Assertions.assertInstanceOf
 import static org.junit.jupiter.api.Assertions.assertTrue
 import static org.mockito.ArgumentMatchers.anyString
 import static org.mockito.Mockito.mockStatic
@@ -219,4 +221,54 @@ class GspPartRendererTests {
         }
     }
 
+    @Test
+    void nestedPartDiagnosticBubblesUp() {
+        def nestedProblemPart = new Part(
+                'nestedProblem.gsp',
+                new PartType([], this.renderer),
+                '<% throw new RuntimeException() %>'
+        )
+        def callerPart = new Part('caller.gsp', null, '<% parts["nestedProblem.gsp"].render() %>')
+        def r = this.renderer.render(
+                callerPart,
+                [:],
+                new SiteSpec('', ''),
+                [:],
+                null,
+                [callerPart, nestedProblemPart],
+                '',
+                ''
+        )
+        assertEquals(1, r.v1.size())
+        assertDiagnosticException(RuntimeException, r.v1[0])
+        assertEquals('', r.v2)
+    }
+
+    @Test
+    void nestedPartIsBlankWhenThrowingExceptionButCallerRendered() {
+        def nestedProblemPart = new Part(
+                'nestedProblem.gsp',
+                new PartType([], this.renderer),
+                '<% throw new RuntimeException() %>'
+        )
+        def callerPart = new Part(
+                'caller.gsp',
+                null,
+                'Hello, World!<% parts["nestedProblem.gsp"].render() %>'
+        )
+        def r = this.renderer.render(
+                callerPart,
+                [:],
+                new SiteSpec('', ''),
+                [:],
+                null,
+                [callerPart, nestedProblemPart],
+                '',
+                ''
+        )
+        assertEquals(1, r.v1.size())
+        assertDiagnosticException(RuntimeException, r.v1[0])
+        assertEquals('Hello, World!', r.v2)
+    }
+
 }
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
index 6405933..b1ee858 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
@@ -1,7 +1,9 @@
 package com.jessebrault.ssg.testutil
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.text.ExcerptGetter
 
+import static org.junit.jupiter.api.Assertions.assertInstanceOf
 import static org.junit.jupiter.api.Assertions.assertTrue
 
 class DiagnosticsUtil {
@@ -21,4 +23,10 @@ class DiagnosticsUtil {
         assertTrue(result.v1.isEmpty(), getDiagnosticsMessageSupplier(result.v1))
     }
 
+    static void assertDiagnosticException(Class<? extends Exception> expectedException, Diagnostic diagnostic) {
+        assertInstanceOf(expectedException, diagnostic.exception, {
+            "Incorrect diagnostic exception class; message: ${ diagnostic.message }"
+        })
+    }
+
 }

From 79c0d158f3ee567bf7012fe73b0dedf841e2acd7 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Thu, 16 Feb 2023 14:11:57 +0100
Subject: [PATCH 28/36] TODO.md

---
 TODO.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 TODO.md

diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..45d4d52
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,19 @@
+# TODO
+
+Here will be kept all of the various todos for this project, organized by release.
+
+## Next
+
+### Add
+- [ ] Add some kind of `outputs` map to dsl that can be used to retrieve various info about another output of the current build. For example:
+    ```groovy
+    // while in a special page 'special.gsp' we could get the 'output' info for a text 'blog/post.md'
+    def post = outputs['blog/post.md']
+    assert post instanceof Output // or something
+    assert post.path == 'blog/post.md'
+    assert post.targetPath = 'blog/post.html'
+    // as well as some other information, perhaps such as the Type, extension, *etc.*
+    ```
+- [ ] Add `extensionUtil` object to dsl.
+
+### Fix

From c5ac81055c3ddd92ec51774b51020ed0bc1acbce Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Sun, 19 Feb 2023 21:41:22 +0100
Subject: [PATCH 29/36] Major refactor to renderers.

---
 buildSrc/src/main/groovy/ssg.common.gradle    |   2 +
 .../ssg/AbstractBuildCommand.groovy           |   8 +-
 .../ssg/SimpleStaticSiteGenerator.groovy      |  83 ++++--
 .../ssg/StaticSiteGenerator.groovy            |   4 +-
 .../jessebrault/ssg/dsl/StandardDslMap.groovy |  80 ++++++
 .../jessebrault/ssg/input/InputPage.groovy    |   5 -
 .../jessebrault/ssg/output/OutputPage.groovy  |  31 ---
 .../ssg/part/EmbeddablePart.groovy            |  40 +--
 .../ssg/part/EmbeddablePartsMap.groovy        |  24 +-
 .../ssg/part/GspPartRenderer.groovy           |  56 ++--
 .../jessebrault/ssg/part/PartRenderer.groovy  |  12 +-
 .../ssg/renderer/RenderContext.groovy         |  22 ++
 .../specialpage/GspSpecialPageRenderer.groovy |  49 ++--
 .../ssg/specialpage/SpecialPage.groovy        |   4 +-
 .../specialpage/SpecialPageRenderer.groovy    |   7 +-
 .../com/jessebrault/ssg/task/Input.groovy     |   5 +
 .../com/jessebrault/ssg/task/Output.groovy    |  20 ++
 .../jessebrault/ssg/task/OutputMeta.groovy    |  20 ++
 .../jessebrault/ssg/task/OutputMetaMap.groovy |  19 ++
 .../com/jessebrault/ssg/task/Task.groovy      |   6 +
 .../jessebrault/ssg/task/TaskContext.groovy   |  21 ++
 .../jessebrault/ssg/task/TaskFactory.groovy   |   7 +
 .../ssg/template/GspTemplateRenderer.groovy   |  44 ++-
 .../ssg/template/TemplateRenderer.groovy      |  14 +-
 .../ssg/text/EmbeddableText.groovy            |   2 +-
 .../com/jessebrault/ssg/text/Text.groovy      |   4 +-
 ...StaticSiteGeneratorIntegrationTests.groovy |   8 +-
 .../ssg/part/GspPartRendererTests.groovy      | 258 ++++-------------
 .../GspSpecialPageRendererTests.groovy        | 238 +---------------
 .../template/GspTemplateRendererTests.groovy  | 261 ++----------------
 .../ssg/dsl/DslScriptletProvider.groovy       |  28 ++
 .../ssg/dsl/StandardDslConsumerTests.groovy   | 180 ++++++++++++
 .../ssg/testutil/DiagnosticsUtil.groovy       |  12 +-
 .../ssg/testutil/RenderContextUtil.groovy     |  21 ++
 .../com/jessebrault/ssg/text/TextMocks.groovy |   8 +
 35 files changed, 680 insertions(+), 923 deletions(-)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
 delete mode 100644 lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy
 delete mode 100644 lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/OutputMeta.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/DslScriptletProvider.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy

diff --git a/buildSrc/src/main/groovy/ssg.common.gradle b/buildSrc/src/main/groovy/ssg.common.gradle
index 5144520..c89d81f 100644
--- a/buildSrc/src/main/groovy/ssg.common.gradle
+++ b/buildSrc/src/main/groovy/ssg.common.gradle
@@ -25,6 +25,8 @@ dependencies {
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
     implementation 'org.slf4j:slf4j-api:1.7.36'
 
+    testFixturesImplementation 'org.slf4j:slf4j-api:1.7.36'
+
     /**
      * TESTING
      */
diff --git a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
index d3cce49..60b8182 100644
--- a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
+++ b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
@@ -1,7 +1,7 @@
 package com.jessebrault.ssg
 
 import com.jessebrault.ssg.buildscript.GroovyBuildScriptRunner
-import com.jessebrault.ssg.output.OutputPage
+import com.jessebrault.ssg.task.Output
 import com.jessebrault.ssg.part.GspPartRenderer
 import com.jessebrault.ssg.part.PartFilePartsProvider
 import com.jessebrault.ssg.part.PartType
@@ -86,10 +86,10 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
                     logger.error(it.message)
                 }
             } else {
-                result.v2.each { OutputPage outputPage ->
-                    def target = new File(it.outDir, outputPage.path)
+                result.v2.each { Output output ->
+                    def target = new File(it.outDir, output.meta.targetPath)
                     target.createParentDirectories()
-                    target.write(outputPage.content)
+                    target.write(output.content)
                 }
             }
         }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
index 97bd00b..cdd50dd 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
@@ -1,7 +1,12 @@
 package com.jessebrault.ssg
 
-import com.jessebrault.ssg.output.OutputPage
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.specialpage.SpecialPage
+import com.jessebrault.ssg.task.Output
+import com.jessebrault.ssg.task.OutputMeta
+import com.jessebrault.ssg.task.OutputMetaMap
 import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.text.Text
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
@@ -22,7 +27,7 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
     private static final Marker exit = MarkerFactory.getMarker('EXIT')
 
     @Override
-    Tuple2<Collection<Diagnostic>, Collection<OutputPage>> generate(Build build) {
+    Tuple2<Collection<Diagnostic>, Collection<Output>> generate(Build build) {
         logger.trace(enter, 'build: {}', build)
         logger.info('processing build with name: {}', build.name)
 
@@ -39,18 +44,29 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
 
         def globals = build.globals
         Collection<Diagnostic> diagnostics = []
-        Collection<OutputPage> generatedPages = []
+        Collection<Output> generatedPages = []
+
+        Map<Text, OutputMeta> textOutputTasks = texts.collectEntries {
+            [(it): new OutputMeta(it.path, stripExtension(it.path) + '.html')]
+        }
+        Map<SpecialPage, OutputMeta> specialPageOutputTasks = specialPages.collectEntries {
+            [(it): new OutputMeta(it.path, stripExtension(it.path) + '.html')]
+        }
+
+        def textOutputMetas = textOutputTasks.values() as ArrayList
+        def specialPageOutputMetas = specialPageOutputTasks.values() as ArrayList
+        def outputMetaMap = new OutputMetaMap([*textOutputMetas, *specialPageOutputMetas])
 
         // Generate pages from each text, but only those that have a 'template' frontMatter field with a valid value
-        texts.each {
-            logger.trace(enter, 'text: {}', it)
-            logger.info('processing text: {}', it.path)
+        textOutputTasks.each { text, outputMeta ->
+            logger.trace(enter, 'text: {}, outputMeta: {}', text, outputMeta)
+            logger.info('processing text: {}', text.path)
 
             // Extract frontMatter from text
-            def frontMatterResult = it.type.frontMatterGetter.get(it)
+            def frontMatterResult = text.type.frontMatterGetter.get(text)
             FrontMatter frontMatter
             if (frontMatterResult.v1.size() > 0) {
-                logger.debug('diagnostics for getting frontMatter for {}: {}', it.path, frontMatterResult.v1)
+                logger.debug('diagnostics for getting frontMatter for {}: {}', text.path, frontMatterResult.v1)
                 diagnostics.addAll(frontMatterResult.v1)
                 logger.trace(exit, '')
                 return
@@ -62,28 +78,30 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             // Find the appropriate template from the frontMatter
             def desiredTemplate = frontMatter.find('template')
             if (desiredTemplate.isEmpty()) {
-                logger.info('{} has no \'template\' key in its frontMatter; skipping generation', it)
+                logger.info('{} has no \'template\' key in its frontMatter; skipping generation', text)
                 return
             }
             def template = templates.find { it.path == desiredTemplate.get() }
             if (template == null) {
-                diagnostics << new Diagnostic('in textFile' + it.path + ' frontMatter.template references an unknown template: ' + desiredTemplate, null)
+                diagnostics << new Diagnostic('in textFile' + text.path + ' frontMatter.template references an unknown template: ' + desiredTemplate, null)
                 logger.trace(exit, '')
                 return
             }
             logger.debug('found template: {}', template)
 
-            def targetPath = stripExtension(it.path) + '.html'
-
             // Render the template using the result of rendering the text earlier
             def templateRenderResult = template.type.renderer.render(
                     template,
-                    frontMatter,
-                    it,
-                    parts,
-                    siteSpec,
-                    globals,
-                    targetPath
+                    text,
+                    new RenderContext(
+                            config,
+                            siteSpec,
+                            globals,
+                            texts,
+                            parts,
+                            outputMeta.sourcePath,
+                            outputMeta.targetPath
+                    )
             )
             String renderedTemplate
             if (templateRenderResult.v1.size() > 0) {
@@ -95,21 +113,25 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
 
             // Create a GeneratedPage
-            generatedPages << new OutputPage(targetPath, renderedTemplate)
+            generatedPages << new Output(outputMeta, renderedTemplate)
+            return
         }
 
         // Generate special pages
-        specialPages.each {
-            logger.info('processing specialPage: {}', it.path)
+        specialPageOutputTasks.each { specialPage, outputMeta ->
+            logger.info('processing specialPage: {}', specialPage.path)
 
-            def targetPath = stripExtension(it.path) + '.html'
-            def specialPageRenderResult = it.type.renderer.render(
-                    it,
-                    texts,
-                    parts,
-                    siteSpec,
-                    globals,
-                    targetPath
+            def specialPageRenderResult = specialPage.type.renderer.render(
+                    specialPage,
+                    new RenderContext(
+                            config,
+                            siteSpec,
+                            globals,
+                            texts,
+                            parts,
+                            outputMeta.sourcePath,
+                            outputMeta.targetPath
+                    )
             )
             String renderedSpecialPage
             if (specialPageRenderResult.v1.size() > 0) {
@@ -121,7 +143,8 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
             }
 
             // Create a GeneratedPage
-            generatedPages << new OutputPage(targetPath, renderedSpecialPage)
+            generatedPages << new Output(outputMeta, renderedSpecialPage)
+            return
         }
 
         logger.trace(exit, '\n\tdiagnostics: {}\n\tgeneratedPages: {}', diagnostics, generatedPages)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
index 37573c9..4ab5504 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
@@ -1,7 +1,7 @@
 package com.jessebrault.ssg
 
-import com.jessebrault.ssg.output.OutputPage
+import com.jessebrault.ssg.task.Output
 
 interface StaticSiteGenerator {
-    Tuple2<Collection<Diagnostic>, Collection<OutputPage>> generate(Build build)
+    Tuple2<Collection<Diagnostic>, Collection<Output>> generate(Build build)
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
new file mode 100644
index 0000000..bbc27e8
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
@@ -0,0 +1,80 @@
+package com.jessebrault.ssg.dsl
+
+import com.jessebrault.ssg.part.EmbeddablePartsMap
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.text.EmbeddableText
+import com.jessebrault.ssg.text.EmbeddableTextsCollection
+import com.jessebrault.ssg.text.Text
+import com.jessebrault.ssg.url.PathBasedUrlBuilder
+import groovy.transform.NullCheck
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.SimpleType
+import org.slf4j.LoggerFactory
+
+final class StandardDslMap {
+
+    @NullCheck(includeGenerated = true)
+    static final class Builder {
+
+        private final Map custom = [:]
+
+        String loggerName = ''
+        Closure onDiagnostics = { }
+        Text text = null
+
+        void putCustom(key, value) {
+            this.custom.put(key, value)
+        }
+
+        void putAllCustom(Map m) {
+            this.custom.putAll(m)
+        }
+
+    }
+
+    static Map get(
+            RenderContext context,
+            @DelegatesTo(value = Builder, strategy = Closure.DELEGATE_FIRST)
+            @ClosureParams(
+                    value = SimpleType,
+                    options = ['com.jessebrault.ssg.dsl.StandardDslMap.Builder']
+            )
+            Closure builderClosure
+    ) {
+        def b = new Builder()
+        builderClosure.resolveStrategy = Closure.DELEGATE_FIRST
+        builderClosure.delegate = b
+        builderClosure(b)
+
+        [:].tap {
+            it.globals = context.globals
+            it.logger = LoggerFactory.getLogger(b.loggerName)
+            it.parts = new EmbeddablePartsMap(
+                    context.parts,
+                    context,
+                    b.onDiagnostics,
+                    b.text
+            )
+            it.siteSpec = context.siteSpec
+            it.sourcePath = context.sourcePath
+            it.targetPath = context.targetPath
+            it.text = b.text ? new EmbeddableText(
+                    b.text,
+                    context.globals,
+                    b.onDiagnostics
+            ) : null
+            it.texts = new EmbeddableTextsCollection(
+                    context.texts,
+                    context.globals,
+                    b.onDiagnostics
+            )
+            it.urlBuilder = new PathBasedUrlBuilder(
+                    context.targetPath,
+                    context.siteSpec.baseUrl
+            )
+
+            it.putAll(b.custom)
+        }
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy
deleted file mode 100644
index 1e37f22..0000000
--- a/lib/src/main/groovy/com/jessebrault/ssg/input/InputPage.groovy
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.jessebrault.ssg.input
-
-interface InputPage {
-    String getPath()
-}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
deleted file mode 100644
index 9b900d4..0000000
--- a/lib/src/main/groovy/com/jessebrault/ssg/output/OutputPage.groovy
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jessebrault.ssg.output
-
-import com.jessebrault.ssg.input.InputPage
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-
-import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
-
-@NullCheck
-@EqualsAndHashCode
-final class OutputPage {
-
-    @Deprecated
-    static OutputPage of(InputPage inputFile, String extension, String content) {
-        new OutputPage(stripExtension(inputFile.path) + extension, content)
-    }
-
-    final String path
-    final String content
-
-    OutputPage(String path, String content) {
-        this.path = path
-        this.content = content
-    }
-
-    @Override
-    String toString() {
-        "GeneratedPage(path: ${ this.path })"
-    }
-
-}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
index 1df64fa..82ede31 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePart.groovy
@@ -1,39 +1,42 @@
 package com.jessebrault.ssg.part
 
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.text.EmbeddableText
+
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.text.Text
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
 import org.jetbrains.annotations.Nullable
 
-@TupleConstructor(includeFields = true, defaults = false)
-@NullCheck
+import static java.util.Objects.requireNonNull
+
 @EqualsAndHashCode(includeFields = true)
 class EmbeddablePart {
 
     private final Part part
-    private final SiteSpec siteSpec
-    private final Map globals
+    private final RenderContext context
     private final Closure onDiagnostics
 
     @Nullable
-    private final EmbeddableText text
+    private final Text text
 
-    private final Collection<Part> allParts
-    private final String path
-    private final String targetPath
+    EmbeddablePart(
+            Part part,
+            RenderContext context,
+            Closure onDiagnostics,
+            @Nullable Text text
+    ) {
+        this.part = requireNonNull(part)
+        this.context = requireNonNull(context)
+        this.onDiagnostics = requireNonNull(onDiagnostics)
+        this.text = text
+    }
 
     String render(Map binding = [:]) {
         def result = part.type.renderer.render(
                 this.part,
                 binding,
-                this.siteSpec,
-                this.globals,
-                this.text,
-                this.allParts,
-                this.path,
-                this.targetPath
+                this.context,
+                this.text
         )
         if (result.v1.size() > 0) {
             this.onDiagnostics.call(result.v1)
@@ -45,8 +48,7 @@ class EmbeddablePart {
 
     @Override
     String toString() {
-        "EmbeddablePart(part: ${ this.part }, globals: ${ this.globals }, path: ${ this.path }, " +
-                "targetPath: ${ this.targetPath })"
+        "EmbeddablePart(part: ${ this.part })"
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
index 1cd852d..26fe807 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/EmbeddablePartsMap.groovy
@@ -1,10 +1,12 @@
 package com.jessebrault.ssg.part
 
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.text.EmbeddableText
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.text.Text
 import groovy.transform.EqualsAndHashCode
 import org.jetbrains.annotations.Nullable
 
+import static java.util.Objects.requireNonNull
+
 @EqualsAndHashCode(includeFields = true)
 class EmbeddablePartsMap {
 
@@ -13,21 +15,15 @@ class EmbeddablePartsMap {
 
     EmbeddablePartsMap(
             Collection<Part> parts,
-            SiteSpec siteSpec,
-            Map globals,
+            RenderContext context,
             Closure onDiagnostics,
-            @Nullable EmbeddableText text = null,
-            String path,
-            String targetPath
+            @Nullable Text text = null
     ) {
-        Objects.requireNonNull(parts)
-        Objects.requireNonNull(siteSpec)
-        Objects.requireNonNull(globals)
-        Objects.requireNonNull(onDiagnostics)
-        Objects.requireNonNull(path)
-        Objects.requireNonNull(targetPath)
+        requireNonNull(parts)
+        requireNonNull(context)
+        requireNonNull(onDiagnostics)
         parts.each {
-            this.put(it.path, new EmbeddablePart(it, siteSpec, globals, onDiagnostics, text, parts, path, targetPath))
+            this.put(it.path, new EmbeddablePart(it, context, onDiagnostics, text))
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
index d3bd1dd..d4360c8 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/GspPartRenderer.groovy
@@ -1,15 +1,14 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.Diagnostic
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
+import com.jessebrault.ssg.dsl.StandardDslMap
+import com.jessebrault.ssg.renderer.RenderContext
 import com.jessebrault.ssg.text.EmbeddableText
-import com.jessebrault.ssg.url.PathBasedUrlBuilder
+import com.jessebrault.ssg.text.Text
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
 import org.jetbrains.annotations.Nullable
-import org.slf4j.LoggerFactory
 
 @EqualsAndHashCode
 class GspPartRenderer implements PartRenderer {
@@ -20,46 +19,27 @@ class GspPartRenderer implements PartRenderer {
     Tuple2<Collection<Diagnostic>, String> render(
             Part part,
             Map binding,
-            SiteSpec siteSpec,
-            Map globals,
-            @Nullable EmbeddableText text = null,
-            Collection<Part> allParts,
-            String path,
-            String targetPath
+            RenderContext context,
+            @Nullable Text text
     ) {
         Objects.requireNonNull(part)
         Objects.requireNonNull(binding)
-        Objects.requireNonNull(siteSpec)
-        Objects.requireNonNull(globals)
-        Objects.requireNonNull(allParts)
-        Objects.requireNonNull(path)
-        Objects.requireNonNull(targetPath)
-        def embeddedPartDiagnostics = []
+        Objects.requireNonNull(context)
+        def diagnostics = []
         try {
-            def result = engine.createTemplate(part.text).make([
-                    binding: binding,
-                    globals: globals,
-                    logger: LoggerFactory.getLogger("Part(${ part.path })"),
-                    parts: new EmbeddablePartsMap(
-                            allParts,
-                            siteSpec,
-                            globals,
-                            embeddedPartDiagnostics.&addAll,
-                            text,
-                            path,
-                            targetPath
-                    ),
-                    path: path,
-                    siteSpec: siteSpec,
-                    tagBuilder: new DynamicTagBuilder(),
-                    targetPath: targetPath,
-                    text: text,
-                    urlBuilder: new PathBasedUrlBuilder(targetPath, siteSpec.baseUrl)
-            ])
-            new Tuple2<>(embeddedPartDiagnostics, result.toString())
+            def dslMap = StandardDslMap.get(context) {
+                it.putCustom('binding', binding)
+                it.loggerName = "GspPart(${ part.path })"
+                it.onDiagnostics = diagnostics.&addAll
+                if (text) {
+                    it.text = text
+                }
+            }
+            def result = engine.createTemplate(part.text).make(dslMap)
+            new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
             new Tuple2<>(
-                    [*embeddedPartDiagnostics, new Diagnostic(
+                    [*diagnostics, new Diagnostic(
                             "An exception occurred while rendering part ${ part.path }:\n${ e }",
                             e
                     )],
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
index 4a281ae..9d27b39 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/part/PartRenderer.groovy
@@ -1,8 +1,8 @@
 package com.jessebrault.ssg.part
 
 import com.jessebrault.ssg.Diagnostic
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.text.EmbeddableText
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.text.Text
 import org.jetbrains.annotations.Nullable
 
 interface PartRenderer {
@@ -10,12 +10,8 @@ interface PartRenderer {
     Tuple2<Collection<Diagnostic>, String> render(
             Part part,
             Map binding,
-            SiteSpec siteSpec,
-            Map globals,
-            @Nullable EmbeddableText text,
-            Collection<Part> allParts,
-            String path,
-            String targetPath
+            RenderContext context,
+            @Nullable Text text
     )
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy b/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
new file mode 100644
index 0000000..5829210
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
@@ -0,0 +1,22 @@
+package com.jessebrault.ssg.renderer
+
+import com.jessebrault.ssg.Config
+import com.jessebrault.ssg.SiteSpec
+import com.jessebrault.ssg.part.Part
+import com.jessebrault.ssg.text.Text
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(defaults = false)
+@NullCheck(includeGenerated = true)
+@EqualsAndHashCode
+final class RenderContext {
+    final Config config
+    final SiteSpec siteSpec
+    final Map globals
+    final Collection<Text> texts
+    final Collection<Part> parts
+    final String sourcePath
+    final String targetPath
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
index 9b78a70..335651c 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRenderer.groovy
@@ -1,18 +1,12 @@
 package com.jessebrault.ssg.specialpage
 
 import com.jessebrault.ssg.Diagnostic
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.part.EmbeddablePartsMap
-import com.jessebrault.ssg.part.Part
-import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
-import com.jessebrault.ssg.text.EmbeddableTextsCollection
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.url.PathBasedUrlBuilder
+import com.jessebrault.ssg.dsl.StandardDslMap
+import com.jessebrault.ssg.renderer.RenderContext
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
-import org.slf4j.LoggerFactory
 
 @NullCheck
 @EqualsAndHashCode
@@ -23,35 +17,24 @@ class GspSpecialPageRenderer implements SpecialPageRenderer {
     @Override
     Tuple2<Collection<Diagnostic>, String> render(
             SpecialPage specialPage,
-            Collection<Text> texts,
-            Collection<Part> parts,
-            SiteSpec siteSpec,
-            Map globals,
-            String targetPath
+            RenderContext context
     ) {
-        Collection<Diagnostic> diagnostics = []
+        def diagnostics = []
         try {
-            def result = engine.createTemplate(specialPage.text).make([
-                    globals: globals,
-                    logger: LoggerFactory.getLogger("SpecialPage(${ specialPage.path })"),
-                    parts: new EmbeddablePartsMap(
-                            parts,
-                            siteSpec,
-                            globals,
-                            diagnostics.&addAll,
-                            specialPage.path,
-                            targetPath
-                    ),
-                    path: specialPage.path,
-                    siteSpec: siteSpec,
-                    tagBuilder: new DynamicTagBuilder(),
-                    targetPath: targetPath,
-                    texts: new EmbeddableTextsCollection(texts, globals, diagnostics.&addAll),
-                    urlBuilder: new PathBasedUrlBuilder(targetPath, siteSpec.baseUrl)
-            ])
+            def dslMap = StandardDslMap.get(context) {
+                it.loggerName = "GspSpecialPage(${ specialPage.path })"
+                it.onDiagnostics = diagnostics.&addAll
+            }
+            def result = engine.createTemplate(specialPage.text).make(dslMap)
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
-            new Tuple2<>([*diagnostics, new Diagnostic("An exception occurred while rendering specialPage ${ specialPage.path }:\n${ e }", e)], '')
+            new Tuple2<>(
+                    [*diagnostics, new Diagnostic(
+                            "An exception occurred while rendering specialPage ${ specialPage.path }:\n${ e }",
+                            e
+                    )],
+                    ''
+            )
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
index c3df5fa..55f1cd5 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
@@ -1,6 +1,6 @@
 package com.jessebrault.ssg.specialpage
 
-import com.jessebrault.ssg.input.InputPage
+import com.jessebrault.ssg.task.Input
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
@@ -8,7 +8,7 @@ import groovy.transform.TupleConstructor
 @TupleConstructor(defaults = false)
 @NullCheck
 @EqualsAndHashCode
-class SpecialPage implements InputPage {
+class SpecialPage implements Input {
 
     String text
     String path
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
index 842267c..44e5363 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPageRenderer.groovy
@@ -3,17 +3,14 @@ package com.jessebrault.ssg.specialpage
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.Part
+import com.jessebrault.ssg.renderer.RenderContext
 import com.jessebrault.ssg.text.Text
 
 interface SpecialPageRenderer {
 
     Tuple2<Collection<Diagnostic>, String> render(
             SpecialPage specialPage,
-            Collection<Text> texts,
-            Collection <Part> parts,
-            SiteSpec siteSpec,
-            Map globals,
-            String targetPath
+            RenderContext context
     )
 
 }
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy
new file mode 100644
index 0000000..39f606b
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy
@@ -0,0 +1,5 @@
+package com.jessebrault.ssg.task
+
+interface Input {
+    String getPath()
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy
new file mode 100644
index 0000000..63f7c53
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy
@@ -0,0 +1,20 @@
+package com.jessebrault.ssg.task
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(defaults = false)
+@NullCheck
+@EqualsAndHashCode
+final class Output {
+
+    final OutputMeta meta
+    final String content
+
+    @Override
+    String toString() {
+        "Output(meta: ${ this.meta })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMeta.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMeta.groovy
new file mode 100644
index 0000000..d8adecf
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMeta.groovy
@@ -0,0 +1,20 @@
+package com.jessebrault.ssg.task
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(defaults = false)
+@NullCheck
+@EqualsAndHashCode
+final class OutputMeta {
+
+    final String sourcePath
+    final String targetPath
+
+    @Override
+    String toString() {
+        "OutputMeta(sourcePath: ${ sourcePath }, targetPath: ${ targetPath })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy
new file mode 100644
index 0000000..ed24f37
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy
@@ -0,0 +1,19 @@
+package com.jessebrault.ssg.task
+
+final class OutputMetaMap {
+
+    @Delegate
+    private final Map<String, OutputMeta> map = [:]
+
+    OutputMetaMap(Collection<OutputMeta> outputMetas) {
+        outputMetas.each {
+            this.put(it.sourcePath, it)
+        }
+    }
+
+    @Override
+    String toString() {
+        "OutputMetaMap(map: ${ this.map })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
new file mode 100644
index 0000000..49a217a
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
@@ -0,0 +1,6 @@
+package com.jessebrault.ssg.task
+
+interface Task {
+    Output getOutput()
+    OutputMeta getOutputMeta()
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy
new file mode 100644
index 0000000..18b4067
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy
@@ -0,0 +1,21 @@
+package com.jessebrault.ssg.task
+
+import com.jessebrault.ssg.Config
+import com.jessebrault.ssg.SiteSpec
+import groovy.transform.TupleConstructor
+import groovy.transform.builder.Builder
+
+@Builder
+@TupleConstructor(defaults = false)
+final class TaskContext {
+
+    final Config config
+    final SiteSpec siteSpec
+    final Collection<OutputMeta> outputMetas
+
+    @Override
+    String toString() {
+        "TaskContext(config: ${ this.config }, siteSpec: ${ this.siteSpec }, outputMetas: ${ this.outputMetas })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
new file mode 100644
index 0000000..bb1ec80
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
@@ -0,0 +1,7 @@
+package com.jessebrault.ssg.task
+
+import org.jetbrains.annotations.Nullable
+
+interface TaskFactory {
+    @Nullable Task getTask(Input input, TaskContext context)
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
index 997bbce..271b240 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/GspTemplateRenderer.groovy
@@ -1,19 +1,13 @@
 package com.jessebrault.ssg.template
 
 import com.jessebrault.ssg.Diagnostic
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.part.EmbeddablePartsMap
-import com.jessebrault.ssg.part.Part
-import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
-import com.jessebrault.ssg.text.EmbeddableText
-import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.dsl.StandardDslMap
+import com.jessebrault.ssg.renderer.RenderContext
 import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.url.PathBasedUrlBuilder
 import groovy.text.GStringTemplateEngine
 import groovy.text.TemplateEngine
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
-import org.slf4j.LoggerFactory
 
 @NullCheck
 @EqualsAndHashCode
@@ -24,32 +18,26 @@ class GspTemplateRenderer implements TemplateRenderer {
     @Override
     Tuple2<Collection<Diagnostic>, String> render(
             Template template,
-            @Deprecated
-            FrontMatter frontMatter,
             Text text,
-            Collection<Part> parts,
-            SiteSpec siteSpec,
-            Map globals,
-            String targetPath
+            RenderContext context
     ) {
         def diagnostics = []
         try {
-            def embeddableText = new EmbeddableText(text, globals, diagnostics.&addAll)
-            def result = engine.createTemplate(template.text).make([
-                    frontMatter: frontMatter,
-                    globals: globals,
-                    logger: LoggerFactory.getLogger("Template(${ template.path })"),
-                    parts: new EmbeddablePartsMap(parts, siteSpec, globals, diagnostics.&addAll, embeddableText, text.path, targetPath),
-                    path: text.path,
-                    siteSpec: siteSpec,
-                    tagBuilder: new DynamicTagBuilder(),
-                    targetPath: targetPath,
-                    text: embeddableText,
-                    urlBuilder: new PathBasedUrlBuilder(targetPath, siteSpec.baseUrl)
-            ])
+            def dslMap = StandardDslMap.get(context) {
+                it.loggerName = "GspTemplate(${ template.path })"
+                it.onDiagnostics = diagnostics.&addAll
+                it.text = text
+            }
+            def result = engine.createTemplate(template.text).make(dslMap)
             new Tuple2<>(diagnostics, result.toString())
         } catch (Exception e) {
-            new Tuple2<>([*diagnostics, new Diagnostic("An exception occurred while rendering Template ${ template.path }:\n${ e }", e)], '')
+            new Tuple2<>(
+                    [*diagnostics, new Diagnostic(
+                            "An exception occurred while rendering Template ${ template.path }:\n${ e }",
+                            e
+                    )],
+                    ''
+            )
         }
     }
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
index 986fe26..ee10f8b 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/template/TemplateRenderer.groovy
@@ -1,25 +1,15 @@
 package com.jessebrault.ssg.template
 
 import com.jessebrault.ssg.Diagnostic
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.part.Part
-import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.renderer.RenderContext
 import com.jessebrault.ssg.text.Text
 
 interface TemplateRenderer {
 
-    /**
-     * TODO: get rid of frontMatter param since we can obtain it from the text
-     */
     Tuple2<Collection<Diagnostic>, String> render(
             Template template,
-            @Deprecated
-            FrontMatter frontMatter,
             Text text,
-            Collection<Part> parts,
-            SiteSpec siteSpec,
-            Map globals,
-            String targetPath
+            RenderContext context
     )
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy b/lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy
index ebea25c..90575cb 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy
@@ -6,7 +6,7 @@ import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
 
 @TupleConstructor(includeFields = true, defaults = false)
-@NullCheck
+@NullCheck(includeGenerated = true)
 @EqualsAndHashCode(includeFields = true)
 class EmbeddableText {
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy b/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
index a81275d..cdafa2a 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
@@ -1,6 +1,6 @@
 package com.jessebrault.ssg.text
 
-import com.jessebrault.ssg.input.InputPage
+import com.jessebrault.ssg.task.Input
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
@@ -8,7 +8,7 @@ import groovy.transform.TupleConstructor
 @TupleConstructor(defaults = false)
 @NullCheck
 @EqualsAndHashCode
-class Text implements InputPage {
+class Text implements Input {
 
     String text
     String path
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
index 5195786..2fc99a7 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
@@ -71,7 +71,7 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         assertTrue(result.v2.size() == 1)
 
         def p0 = result.v2[0]
-        assertEquals('test.html', p0.path)
+        assertEquals('test.html', p0.meta.targetPath)
         assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.content)
     }
 
@@ -91,7 +91,7 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         assertTrue(result.v2.size() == 1)
 
         def p0 = result.v2[0]
-        assertEquals('nested/nested.html', p0.path)
+        assertEquals('nested/nested.html', p0.meta.targetPath)
         assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.content)
     }
 
@@ -107,11 +107,11 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         assertEmptyDiagnostics(result)
         assertEquals(2, result.v2.size())
 
-        def testPage = result.v2.find { it.path == 'test.html' }
+        def testPage = result.v2.find { it.meta.targetPath == 'test.html' }
         assertNotNull(testPage)
         assertEquals('2', testPage.content)
 
-        def specialPage = result.v2.find { it.path == 'special.html' }
+        def specialPage = result.v2.find { it.meta.targetPath == 'special.html' }
         assertNotNull(specialPage)
         assertEquals('<p>Hello, World!</p>\n', specialPage.content)
     }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
index 833671a..0e85049 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/part/GspPartRendererTests.groovy
@@ -1,224 +1,58 @@
 package com.jessebrault.ssg.part
 
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.text.EmbeddableText
+import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.dsl.StandardDslConsumerTests
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.text.Text
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.Mock
-import org.mockito.MockedStatic
 import org.mockito.junit.jupiter.MockitoExtension
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertDiagnosticException
-import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
-import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
+import static com.jessebrault.ssg.testutil.RenderContextUtil.getRenderContext
 import static com.jessebrault.ssg.text.TextMocks.renderableText
 import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertInstanceOf
-import static org.junit.jupiter.api.Assertions.assertTrue
-import static org.mockito.ArgumentMatchers.anyString
-import static org.mockito.Mockito.mockStatic
-import static org.mockito.Mockito.verify
 
 @ExtendWith(MockitoExtension)
-class GspPartRendererTests {
+class GspPartRendererTests implements StandardDslConsumerTests {
 
     private final PartRenderer renderer = new GspPartRenderer()
 
-    @Test
-    void rendersWithNoBindingOrGlobals() {
-        def part = new Part('', null, 'Hello, World!')
-        def r = this.renderer.render(
-                part,
-                [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [part],
-                '',
-                ''
+    private Tuple2<Collection<Diagnostic>, String> doRender(
+            String scriptlet,
+            RenderContext context,
+            Map binding = [:],
+            Text text = null
+    ) {
+        this.renderer.render(
+                new Part('', new PartType([], this.renderer), scriptlet),
+                binding,
+                context,
+                text
         )
-        assertTrue(r.v1.size() == 0)
-        assertEquals('Hello, World!', r.v2)
+    }
+
+    @Override
+    Tuple2<Collection<Diagnostic>, String> render(String scriptlet, RenderContext context) {
+        this.doRender(scriptlet, context)
     }
 
     @Test
     void rendersWithBinding() {
-        def part = new Part('', null, "<%= binding['greeting'] %>")
-        def r = this.renderer.render(
-                part,
-                [greeting: 'Hello, World!'],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [part],
-                '',
-                ''
+        this.checkResult(
+                'Hello, World!',
+                this.doRender('<%= binding.greeting %>', getRenderContext(), [greeting: 'Hello, World!'])
         )
-        assertTrue(r.v1.size() == 0)
-        assertEquals('Hello, World!', r.v2)
-    }
-
-    @Test
-    void rendersWithGlobals() {
-        def part = new Part(null, null, "<%= globals['greeting'] %>")
-        def r = this.renderer.render(
-                part,
-                [:],
-                new SiteSpec('', ''),
-                [greeting: 'Hello, World!'],
-                null,
-                [part],
-                '',
-                ''
-        )
-        assertTrue(r.v1.size() == 0)
-        assertEquals('Hello, World!', r.v2)
     }
 
     @Test
     void textAvailable() {
-        def part = new Part('', null, '<%= text.render() %>')
-        def textDiagnostics = []
-        def r = this.renderer.render(
-                part,
+        this.checkResult('Hello, World!', this.renderer.render(
+                new Part('', new PartType([], this.renderer), '<%= text.render() %>'),
                 [:],
-                new SiteSpec('', ''),
-                [:],
-                new EmbeddableText(renderableText('Hello, World!'), [:], textDiagnostics.&addAll),
-                [part],
-                '',
-                ''
-        )
-        assertTrue(textDiagnostics.isEmpty())
-        assertTrue(r.v1.isEmpty())
-        assertEquals('Hello, World!', r.v2)
-    }
-
-    @Test
-    void tagBuilderAvailable() {
-        def part = new Part('', null, '<%= tagBuilder.test() %>')
-        def r = this.renderer.render(
-                part,
-                [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [part],
-                '',
-                ''
-        )
-        assertTrue(r.v1.isEmpty())
-        assertEquals('<test />', r.v2)
-    }
-
-    @Test
-    void allPartsAvailable() {
-        def partType = new PartType(['.gsp'], this.renderer)
-        def part0 = new Part('part0.gsp', partType, '<%= parts["part1.gsp"].render() %>')
-        def part1 = new Part('part1.gsp', partType, 'Hello, World!')
-        def r = this.renderer.render(
-                part0,
-                [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [part0, part1],
-                '',
-                ''
-        )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
-        assertEquals('Hello, World!', r.v2)
-    }
-
-    @Test
-    void pathAvailableIfPresent() {
-        def part = new Part('', null, '<%= path %>')
-        def r = this.renderer.render(
-                part,
-                [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [part],
-                'test.md',
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('test.md', r.v2)
-    }
-
-    @Test
-    void urlBuilderAvailable() {
-        def part = new Part('', null, '<%= urlBuilder.relative("images/test.jpg") %>')
-        def r = this.renderer.render(
-                part,
-                [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [part],
-                '',
-                'test/test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('../images/test.jpg', r.v2)
-    }
-
-    @Test
-    void targetPathAvailable() {
-        def part = new Part('', null, '<%= targetPath %>')
-        def r = this.renderer.render(
-                part,
-                [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [part],
-                '',
-                'test/test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('test/test.html', r.v2)
-    }
-
-    @Test
-    void siteSpecBaseUrlAvailable() {
-        def part = new Part('', null, '<%= siteSpec.baseUrl %>')
-        def r = this.renderer.render(
-                part,
-                [:],
-                new SiteSpec('', 'https://test.com'),
-                [:],
-                null,
-                [part],
-                '',
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('https://test.com', r.v2)
-    }
-
-    @Test
-    void loggerAvailable(@Mock Logger logger) {
-        try (MockedStatic<LoggerFactory> loggerFactory = mockStatic(LoggerFactory)) {
-            loggerFactory.when { LoggerFactory.getLogger(anyString()) }
-                    .thenReturn(logger)
-            def part = new Part('', null, '<% logger.info "Hello, World!" %>')
-            def r = this.renderer.render(
-                    part,
-                    [:],
-                    new SiteSpec('', ''),
-                    [:],
-                    null,
-                    [part],
-                    '',
-                    ''
-            )
-            assertEmptyDiagnostics(r)
-            verify(logger).info('Hello, World!')
-        }
+                getRenderContext(),
+                renderableText('Hello, World!')
+        ))
     }
 
     @Test
@@ -228,16 +62,16 @@ class GspPartRendererTests {
                 new PartType([], this.renderer),
                 '<% throw new RuntimeException() %>'
         )
-        def callerPart = new Part('caller.gsp', null, '<% parts["nestedProblem.gsp"].render() %>')
+        def callerPart = new Part(
+                'caller.gsp',
+                null,
+                '<% parts["nestedProblem.gsp"].render() %>'
+        )
         def r = this.renderer.render(
                 callerPart,
                 [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [callerPart, nestedProblemPart],
-                '',
-                ''
+                getRenderContext(parts: [callerPart, nestedProblemPart]),
+                null
         )
         assertEquals(1, r.v1.size())
         assertDiagnosticException(RuntimeException, r.v1[0])
@@ -249,7 +83,7 @@ class GspPartRendererTests {
         def nestedProblemPart = new Part(
                 'nestedProblem.gsp',
                 new PartType([], this.renderer),
-                '<% throw new RuntimeException() %>'
+                '<% throw new RuntimeException("nested problem exception") %>'
         )
         def callerPart = new Part(
                 'caller.gsp',
@@ -259,15 +93,17 @@ class GspPartRendererTests {
         def r = this.renderer.render(
                 callerPart,
                 [:],
-                new SiteSpec('', ''),
-                [:],
-                null,
-                [callerPart, nestedProblemPart],
-                '',
-                ''
+                getRenderContext(parts: [callerPart, nestedProblemPart]),
+                null
         )
         assertEquals(1, r.v1.size())
-        assertDiagnosticException(RuntimeException, r.v1[0])
+        assertDiagnosticException(RuntimeException, r.v1[0]) { e ->
+            assertEquals('nested problem exception', e.message, {
+                def w = new StringWriter()
+                e.printStackTrace(new PrintWriter(w))
+                w.toString()
+            })
+        }
         assertEquals('Hello, World!', r.v2)
     }
 
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
index 993c787..5f7561b 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/specialpage/GspSpecialPageRendererTests.groovy
@@ -1,242 +1,22 @@
 package com.jessebrault.ssg.specialpage
 
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.part.Part
-import com.jessebrault.ssg.part.PartRenderer
-import com.jessebrault.ssg.part.PartType
-import com.jessebrault.ssg.text.*
-import org.junit.jupiter.api.Test
+import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.dsl.StandardDslConsumerTests
+import com.jessebrault.ssg.renderer.RenderContext
 import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.Mock
-import org.mockito.MockedStatic
 import org.mockito.junit.jupiter.MockitoExtension
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.mockito.ArgumentMatchers.any
-import static org.mockito.ArgumentMatchers.anyString
-import static org.mockito.ArgumentMatchers.argThat
-import static org.mockito.Mockito.mockStatic
-import static org.mockito.Mockito.verify
-import static org.mockito.Mockito.when
 
 @ExtendWith(MockitoExtension)
-class GspSpecialPageRendererTests {
+class GspSpecialPageRendererTests implements StandardDslConsumerTests {
 
     private final SpecialPageRenderer renderer = new GspSpecialPageRenderer()
 
-    @Test
-    void rendersGlobal() {
-        def specialPage = new SpecialPage("<%= globals['greeting'] %>", 'test.gsp', null)
-        def globals = [greeting: 'Hello, World!']
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [],
-                new SiteSpec('', ''),
-                globals,
-                ''
+    @Override
+    Tuple2<Collection<Diagnostic>, String> render(String scriptlet, RenderContext context) {
+        this.renderer.render(
+                new SpecialPage(scriptlet, '', new SpecialPageType([], this.renderer)),
+                context
         )
-        assertEmptyDiagnostics(r)
-        assertEquals('Hello, World!', r.v2)
-    }
-
-    @Test
-    void rendersPartWithNoBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any(), any()))
-                .thenReturn(new Tuple2<>([], 'Hello, World!'))
-        def partType = new PartType([], partRenderer)
-        def part = new Part('test', partType , '')
-
-        def specialPage = new SpecialPage("<%= parts['test'].render() %>", 'test.gsp', null)
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [part],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('Hello, World!', r.v2)
-    }
-
-    @Test
-    void rendersPartWithBinding(@Mock PartRenderer partRenderer) {
-        when(partRenderer.render(
-                any(),
-                argThat { Map m -> m.get('greeting') == 'Hello, World!'},
-                any(),
-                any(),
-                any(),
-                any(),
-                any(),
-                any()
-        )).thenReturn(new Tuple2<>([], 'Hello, World!'))
-        def partType = new PartType([], partRenderer)
-        def part = new Part('test', partType, '')
-
-        def specialPage = new SpecialPage(
-                "<%= parts['test'].render([greeting: 'Hello, World!'])",
-                'test.gsp',
-                null
-        )
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [part],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('Hello, World!', r.v2)
-    }
-
-    @Test
-    void rendersText(@Mock TextRenderer textRenderer, @Mock FrontMatterGetter frontMatterGetter) {
-        when(textRenderer.render(any(), any()))
-                .thenReturn(new Tuple2<>([], '<p><strong>Hello, World!</strong></p>\n'))
-        def textType = new TextType([], textRenderer, frontMatterGetter, new MarkdownExcerptGetter())
-        def text = new Text('', 'test', textType)
-
-        def specialPage = new SpecialPage(
-                "<%= texts.find { it.path == 'test' }.render() %>",
-                'test.gsp',
-                null
-        )
-        def r = this.renderer.render(
-                specialPage,
-                [text],
-                [],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('<p><strong>Hello, World!</strong></p>\n', r.v2)
-    }
-
-    @Test
-    void tagBuilderAvailable() {
-        def specialPage = new SpecialPage('<%= tagBuilder.test() %>', 'test.gsp', null)
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('<test />', r.v2)
-    }
-
-    @Test
-    void pathAvailable() {
-        def specialPage = new SpecialPage('<%= path %>', 'test.gsp', null)
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('test.gsp', r.v2)
-    }
-
-    @Test
-    void urlBuilderAvailable() {
-        def specialPage = new SpecialPage(
-                '<%= urlBuilder.relative("images/test.jpg") %>',
-                'test.gsp',
-                null
-        )
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [],
-                new SiteSpec('', ''),
-                [:],
-                'test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('images/test.jpg', r.v2)
-    }
-
-    @Test
-    void urlBuilderIsRelativeToTargetPath() {
-        def specialPage = new SpecialPage(
-                '<%= urlBuilder.relative("images/test.jpg") %>',
-                '',
-                null
-        )
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [],
-                new SiteSpec('', ''),
-                [:],
-                'test/test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('../images/test.jpg', r.v2)
-    }
-
-    @Test
-    void targetPathAvailable() {
-        def specialPage = new SpecialPage(
-                '<%= targetPath %>',
-                '',
-                null
-        )
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [],
-                new SiteSpec('', ''),
-                [:],
-                'test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('test.html', r.v2)
-    }
-
-    @Test
-    void siteSpecBaseUrlAvailable() {
-        def specialPage = new SpecialPage(
-                '<%= siteSpec.baseUrl %>',
-                '',
-                null
-        )
-        def r = this.renderer.render(
-                specialPage,
-                [],
-                [],
-                new SiteSpec('', 'https://test.com'),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('https://test.com', r.v2)
-    }
-
-    @Test
-    void loggerAvailable(@Mock Logger logger) {
-        try (MockedStatic<LoggerFactory> loggerFactory = mockStatic(LoggerFactory)) {
-            loggerFactory.when { LoggerFactory.getLogger(anyString()) }
-                    .thenReturn(logger)
-            def specialPage = new SpecialPage('<% logger.info "Hello, World!" %>', '', null)
-            def r = this.renderer.render(
-                    specialPage, [], [], new SiteSpec('', ''), [:], ''
-            )
-            assertEmptyDiagnostics(r)
-            verify(logger).info('Hello, World!')
-        }
     }
 
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
index d24de67..94e342b 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/template/GspTemplateRendererTests.groovy
@@ -1,274 +1,47 @@
 package com.jessebrault.ssg.template
 
-import com.jessebrault.ssg.SiteSpec
-import com.jessebrault.ssg.part.Part
-import com.jessebrault.ssg.part.PartRenderer
-import com.jessebrault.ssg.part.PartType
-import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.dsl.StandardDslConsumerTests
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.text.Text
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.Mock
-import org.mockito.MockedStatic
 import org.mockito.junit.jupiter.MockitoExtension
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 
-import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
-import static com.jessebrault.ssg.text.TextMocks.*
+import static com.jessebrault.ssg.testutil.RenderContextUtil.getRenderContext
+import static com.jessebrault.ssg.text.TextMocks.blankText
+import static com.jessebrault.ssg.text.TextMocks.renderableText
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
-import static org.mockito.ArgumentMatchers.any
-import static org.mockito.ArgumentMatchers.anyString
-import static org.mockito.ArgumentMatchers.argThat
-import static org.mockito.Mockito.mockStatic
-import static org.mockito.Mockito.verify
-import static org.mockito.Mockito.when
 
 @ExtendWith(MockitoExtension)
-class GspTemplateRendererTests {
+class GspTemplateRendererTests implements StandardDslConsumerTests {
 
     private final TemplateRenderer renderer = new GspTemplateRenderer()
 
-    @Test
-    void rendersPartWithNoBinding(@Mock PartRenderer partRenderer) {
-        def template = new Template(
-                "<%= parts['test'].render() %>",
-                null,
-                null
-        )
-
-        when(partRenderer.render(any(), any(), any(), any(), any(), any(), any(), any()))
-                .thenReturn(new Tuple2<>([], 'Hello, World!'))
-        def partType = new PartType([], partRenderer)
-        def part = new Part('test', partType, null)
-
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [part],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
-        assertEquals('Hello, World!', r.v2)
+    private Tuple2<Collection<Diagnostic>, String> doRender(String scriptlet, Text text, RenderContext context) {
+        this.renderer.render(new Template(scriptlet, '', null), text, context)
     }
 
-    @Test
-    void rendersPartWithBinding(@Mock PartRenderer partRenderer) {
-        def template = new Template(
-                "<%= parts['greeting'].render([person: 'World']) %>",
-                null,
-                null
-        )
-
-        when(partRenderer.render(
-                any(),
-                argThat { Map m -> m.get('person') == 'World' },
-                any(),
-                any(),
-                any(),
-                any(),
-                any(),
-                any()
-        )).thenReturn(new Tuple2<>([], 'Hello, World!'))
-
-        def partType = new PartType([], partRenderer)
-        def part = new Part('greeting', partType, null)
-
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [part],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('Hello, World!', r.v2)
-    }
-
-    @Test
-    void rendersFrontMatter() {
-        def template = new Template("<%= frontMatter['title'] %>", null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [title: ['Hello!']]),
-                blankText(),
-                [],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('Hello!', r.v2)
-    }
-
-    @Test
-    void rendersGlobal() {
-        def template = new Template("<%= globals['test'] %>", null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [],
-                new SiteSpec('', ''),
-                [test: 'Hello, World!'],
-                ''
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('Hello, World!', r.v2)
+    @Override
+    Tuple2<Collection<Diagnostic>, String> render(String scriptlet, RenderContext context) {
+        this.doRender(scriptlet, blankText(), context)
     }
 
+    /**
+     * TODO: refactor this and the super interface methods so that we can re-use rendering logic
+     */
     @Test
     void textAvailableToRender() {
         def template = new Template('<%= text.render() %>', null, null)
         def r = this.renderer.render(
                 template,
-                new FrontMatter(null, [:]),
                 renderableText('Hello, World!'),
-                [],
-                new SiteSpec('', ''),
-                [:],
-                ''
+                getRenderContext()
         )
         assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
         assertEquals('Hello, World!', r.v2)
     }
 
-    @Test
-    void tagBuilderAvailable() {
-        def template = new Template('<%= tagBuilder.test() %>', null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
-        assertEquals('<test />', r.v2)
-    }
-
-    @Test
-    void pathAvailable() {
-        def template = new Template('<%= path %>', null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                textWithPath('test.md'),
-                [],
-                new SiteSpec('', ''),
-                [:],
-                ''
-        )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
-        assertEquals('test.md', r.v2)
-    }
-
-    @Test
-    void urlBuilderAvailable() {
-        def template = new Template('<%= urlBuilder.relative("images/test.jpg") %>', null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [],
-                new SiteSpec('', ''),
-                [:],
-                'test.html'
-        )
-        assertTrue(r.v1.isEmpty(), getDiagnosticsMessageSupplier(r.v1))
-        assertEquals('images/test.jpg', r.v2)
-    }
-
-    @Test
-    void urlBuilderIsRelativeToTargetPath() {
-        def template = new Template('<%= urlBuilder.relative("images/test.jpg") %>', null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [],
-                new SiteSpec('', ''),
-                [:],
-                'test/test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('../images/test.jpg', r.v2)
-    }
-
-    @Test
-    void urlBuilderAbsolutePathCorrect() {
-        def template = new Template('<%= urlBuilder.absolute %>', null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [],
-                new SiteSpec('', 'https://test.com'),
-                [:],
-                'test/test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('https://test.com/test/test.html', r.v2)
-    }
-
-    @Test
-    void targetPathAvailable() {
-        def template = new Template('<%= targetPath %>', null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [],
-                new SiteSpec('', ''),
-                [:],
-                'test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('test.html', r.v2)
-    }
-
-    @Test
-    void siteSpecBaseUrlAvailable() {
-        def template = new Template('<%= siteSpec.baseUrl %>', null, null)
-        def r = this.renderer.render(
-                template,
-                new FrontMatter(null, [:]),
-                blankText(),
-                [],
-                new SiteSpec('', 'https://test.com'),
-                [:],
-                'test.html'
-        )
-        assertEmptyDiagnostics(r)
-        assertEquals('https://test.com', r.v2)
-    }
-
-    @Test
-    void loggerAvailable(@Mock Logger logger) {
-        try (MockedStatic<LoggerFactory> loggerFactory = mockStatic(LoggerFactory)) {
-            loggerFactory.when(() -> LoggerFactory.getLogger(anyString()))
-                    .thenReturn(logger)
-            def template = new Template('<% logger.info "Hello, World!" %>', null, null)
-            def r = this.renderer.render(
-                    template,
-                    new FrontMatter(null, [:]),
-                    blankText(),
-                    [],
-                    new SiteSpec('', ''),
-                    [:],
-                    ''
-            )
-            assertEmptyDiagnostics(r)
-            verify(logger).info('Hello, World!')
-        }
-    }
-
 }
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/DslScriptletProvider.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/DslScriptletProvider.groovy
new file mode 100644
index 0000000..3b9689b
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/DslScriptletProvider.groovy
@@ -0,0 +1,28 @@
+package com.jessebrault.ssg.dsl
+
+interface DslScriptletProvider {
+    String getGlobalsAvailable()
+    String getRenderGlobal()
+
+    String getLoggerAvailable()
+
+    String getPartsAvailable()
+    String getRenderPartFromParts()
+
+    String getSiteSpecAvailable()
+    String getRenderSiteSpecValues()
+
+    String getSourcePathAvailable()
+    String getRenderSourcePathValue()
+
+    String getTagBuilderAvailable()
+
+    String getTargetPathAvailable()
+    String getRenderTargetPath()
+
+    String getTextsAvailable()
+    String getRenderTextFromTexts()
+
+    String getUrlBuilderAvailable()
+    String getUrlBuilderCorrectlyConfigured()
+}
\ No newline at end of file
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
new file mode 100644
index 0000000..9d2019a
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
@@ -0,0 +1,180 @@
+package com.jessebrault.ssg.dsl
+
+import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.SiteSpec
+import com.jessebrault.ssg.part.EmbeddablePartsMap
+import com.jessebrault.ssg.part.Part
+import com.jessebrault.ssg.part.PartRenderer
+import com.jessebrault.ssg.part.PartType
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.tagbuilder.TagBuilder
+import com.jessebrault.ssg.text.EmbeddableTextsCollection
+import com.jessebrault.ssg.url.UrlBuilder
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.Mock
+import org.mockito.MockedStatic
+import org.mockito.junit.jupiter.MockitoExtension
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
+import static com.jessebrault.ssg.testutil.RenderContextUtil.getRenderContext
+import static com.jessebrault.ssg.text.TextMocks.renderableTextWithPath
+import static org.junit.jupiter.api.Assertions.assertEquals
+import static org.junit.jupiter.api.Assertions.fail
+import static org.mockito.ArgumentMatchers.any
+import static org.mockito.ArgumentMatchers.anyString
+import static org.mockito.Mockito.*
+
+@ExtendWith(MockitoExtension)
+interface StandardDslConsumerTests {
+
+    Tuple2<Collection<Diagnostic>, String> render(String scriptlet, RenderContext context)
+
+    default void checkResult(String expected, Tuple2<Collection<Diagnostic>, String> result) {
+        assertEmptyDiagnostics(result)
+        assertEquals(expected, result.v2)
+    }
+
+    default void doDslRenderTest(String expected, String scriptlet, RenderContext context = null) {
+        this.checkResult(expected, this.render(scriptlet, context ?: getRenderContext()))
+    }
+
+    default void doDslAssertionTest(String scriptlet, RenderContext context = null) {
+        try {
+            this.render(scriptlet, context ?: getRenderContext())
+        } catch (AssertionError e) {
+            fail(e)
+        }
+    }
+
+    @Test
+    default void rendersGlobal() {
+        this.doDslRenderTest(
+                'Hello, World!',
+                '<%= globals.test %>',
+                getRenderContext(globals: [test: 'Hello, World!'])
+        )
+    }
+
+    @Test
+    default void loggerAvailable(@Mock Logger logger) {
+        try (MockedStatic<LoggerFactory> loggerFactory = mockStatic(LoggerFactory)) {
+            loggerFactory.when { LoggerFactory.getLogger(anyString()) }
+                    .thenReturn(logger)
+
+            this.doDslAssertionTest('<% assert logger; logger.info("Hello, World!") %>')
+            verify(logger).info('Hello, World!')
+        }
+    }
+
+    @Test
+    default void partsAvailable() {
+        this.doDslAssertionTest("<% assert parts != null && parts instanceof ${ EmbeddablePartsMap.name } %>")
+    }
+
+    @Test
+    default void partAvailableAndRenderable(@Mock PartRenderer partRenderer) {
+        when(partRenderer.render(any(), any(), any(), any()))
+                .thenReturn(new Tuple2<>([], 'Hello, World!'))
+        def part = new Part(
+                'test.gsp',
+                new PartType([], partRenderer),
+                'Hello, World!'
+        )
+        this.doDslRenderTest(
+                'Hello, World!',
+                '<%= parts["test.gsp"].render() %>',
+                getRenderContext(parts: [part])
+        )
+    }
+
+    @Test
+    default void siteSpecAvailable() {
+        this.doDslAssertionTest(
+                "<% assert siteSpec && siteSpec instanceof ${ SiteSpec.name } %>"
+        )
+    }
+
+    @Test
+    default void siteSpecRendersCorrectValues() {
+        def siteSpec = new SiteSpec('Test Site', 'https://test.com')
+        this.doDslRenderTest(
+                'Test Site https://test.com',
+                '<%= siteSpec.name + " " + siteSpec.baseUrl %>',
+                getRenderContext(siteSpec: siteSpec)
+        )
+    }
+
+    @Test
+    default void sourcePathAvailable() {
+        this.doDslAssertionTest(
+                '<% assert sourcePath && sourcePath instanceof String %>',
+                getRenderContext(sourcePath: 'test.md')
+        )
+    }
+
+    @Test
+    default void sourcePathRendersCorrectValue() {
+        this.doDslRenderTest(
+                'test.md',
+                '<%= sourcePath %>',
+                getRenderContext(sourcePath: 'test.md')
+        )
+    }
+
+    @Test
+    default void tagBuilderAvailable() {
+        this.doDslAssertionTest("<% assert tagBuider && tagBuilder instanceof ${ TagBuilder.name } %>")
+    }
+
+    @Test
+    default void targetPathAvailable() {
+        this.doDslAssertionTest(
+                '<% assert targetPath && targetPath instanceof String %>',
+                getRenderContext(targetPath: 'test/test.html')
+        )
+    }
+
+    @Test
+    default void targetPathRendersCorrectValue() {
+        this.doDslRenderTest(
+                'test/test.html',
+                '<%= targetPath %>',
+                getRenderContext(targetPath: 'test/test.html')
+        )
+    }
+
+    @Test
+    default void textsAvailable() {
+        this.doDslAssertionTest(
+                "<% assert texts != null && texts instanceof ${ EmbeddableTextsCollection.name } %>"
+        )
+    }
+
+    @Test
+    default void textsTextAvailableAndRenderable() {
+        def testText = renderableTextWithPath('Hello, World!', 'test.md')
+        this.doDslRenderTest(
+                'Hello, World!',
+                '<%= texts.find { it.path == "test.md" }.render() %>',
+                getRenderContext(texts: [testText])
+        )
+    }
+
+    @Test
+    default void urlBuilderAvailable() {
+        this.doDslAssertionTest("<% assert urlBuilder && urlBuilder instanceof ${ UrlBuilder.name } %>")
+    }
+
+    @Test
+    default void urlBuilderCorrectlyConfigured() {
+        this.doDslRenderTest(
+                '../images/test.jpg',
+                '<%= urlBuilder.relative("images/test.jpg") %>',
+                getRenderContext(targetPath: 'test/test.html')
+        )
+    }
+
+}
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
index b1ee858..77a3be3 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
@@ -2,6 +2,8 @@ package com.jessebrault.ssg.testutil
 
 import com.jessebrault.ssg.Diagnostic
 import com.jessebrault.ssg.text.ExcerptGetter
+import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.FirstParam
 
 import static org.junit.jupiter.api.Assertions.assertInstanceOf
 import static org.junit.jupiter.api.Assertions.assertTrue
@@ -23,10 +25,18 @@ class DiagnosticsUtil {
         assertTrue(result.v1.isEmpty(), getDiagnosticsMessageSupplier(result.v1))
     }
 
-    static void assertDiagnosticException(Class<? extends Exception> expectedException, Diagnostic diagnostic) {
+    static <E extends Exception> void assertDiagnosticException(
+            Class<E> expectedException,
+            Diagnostic diagnostic,
+            @ClosureParams(FirstParam.FirstGenericType)
+            Closure<Void> additionalAssertions = null
+    ) {
         assertInstanceOf(expectedException, diagnostic.exception, {
             "Incorrect diagnostic exception class; message: ${ diagnostic.message }"
         })
+        if (additionalAssertions) {
+            additionalAssertions(diagnostic.exception)
+        }
     }
 
 }
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
new file mode 100644
index 0000000..a306b14
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
@@ -0,0 +1,21 @@
+package com.jessebrault.ssg.testutil
+
+import com.jessebrault.ssg.Config
+import com.jessebrault.ssg.SiteSpec
+import com.jessebrault.ssg.renderer.RenderContext
+
+class RenderContextUtil {
+
+    static RenderContext getRenderContext(Map args = null) {
+        new RenderContext(
+                args?.config as Config ?: new Config(),
+                args?.siteSpec as SiteSpec ?: new SiteSpec('', ''),
+                args?.globals as Map ?: [:],
+                args?.texts as Collection ?: [],
+                args?.parts as Collection ?: [],
+                args?.sourcePath as String ?: '',
+                args?.targetPath as String ?: ''
+        )
+    }
+
+}
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
index 0d31ff0..fe9e566 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
@@ -28,4 +28,12 @@ class TextMocks {
         new Text('', path, new TextType([], textRenderer, frontMatterGetter, excerptGetter))
     }
 
+    static Text renderableTextWithPath(String text, String path) {
+        def textRenderer = mock(TextRenderer)
+        when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
+        def frontMatterGetter = mock(FrontMatterGetter)
+        def excerptGetter = mock(ExcerptGetter)
+        new Text('', path, new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+    }
+
 }

From 3dcc25dff7a903602a36a137d4b0bc88d767e195 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Sun, 19 Feb 2023 21:46:22 +0100
Subject: [PATCH 30/36] Update CHANGELOG.md

---
 CHANGELOG.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cb1753..8aa3adf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,20 +40,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
     %>
     ```
     [6de83df](https://github.com/JesseBrault0709/ssg/commit/6de83df), [06499a9](https://github.com/JesseBrault0709/ssg/commit/06499a9).
-- Templates, SpecialPages, and Parts all have access to `path` of type `String` representing the path of the 'source' file: either a text file or a special page. In Templates, the 'source' comes from the path of the Text being rendered; in SpecialPages, this comes from the path of the SpecialPage being rendered (i.e., itself); in Parts, this comes from either the Template or SpecialPage which called (i.e., embedded) the Part. 
+- Templates, SpecialPages, and Parts all have access to `sourcePath` of type `String` representing the path of the 'source' file: either a text file or a special page. In Templates, the 'source' comes from the path of the Text being rendered; in SpecialPages, this comes from the path of the SpecialPage being rendered (i.e., itself); in Parts, this comes from either the Template or SpecialPage which called (i.e., embedded) the Part. 
     ```gsp
     <%
         // in a template or part when rendering a text at 'home.md'
-        assert path == 'home.md'
+        assert sourcePath == 'home.md'
     
         // in a template or part when rendering a text at 'posts/helloWorld.md'
-        assert path == 'posts/helloWorld.md'
+        assert sourcePath == 'posts/helloWorld.md'
     
         // in a special page or part when rendering a special page at 'foo/bar/specialPage.gsp'
-        assert path == 'foo/bar/specialPage.gsp'
+        assert sourcePath == 'foo/bar/specialPage.gsp'
     %>
     ```
-  [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41), [9983685](https://github.com/JesseBrault0709/ssg/commit/9983685), [076bc9b](https://github.com/JesseBrault0709/ssg/commit/076bc9b).
+  [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41), [9983685](https://github.com/JesseBrault0709/ssg/commit/9983685), [076bc9b](https://github.com/JesseBrault0709/ssg/commit/076bc9b), [c5ac810](https://github.com/JesseBrault0709/ssg/commit/c5ac810).
 - Templates, SpecialPages, and Parts all have access to a `urlBuilder` of type [`PathBasedUrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/PathBasedUrlBuilder.groovy) (implementing [`UrlBuilder`](lib/src/main/groovy/com/jessebrault/ssg/url/UrlBuilder.groovy)). It can be used to obtain both absolute (using `siteSpec.baseUrl`) and relative urls (to the current `targetPath`). Use it like so:
     ```gsp
     <%
@@ -103,7 +103,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Parts have a `text` object of type [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy). If one is rendering a Part called from anything other than a Template (which has an associated text), this will be `null`. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
 
 ### Breaking Changes
-- The `path` object of type `String`, where it did previously exist, was stripped of its extension when previously referring to Texts or SpecialPages; now, the extension is present. For example:
+- The path of a file was stripped of its extension when previously referring to Texts or SpecialPages; now, the extension is present. For example:
     ```gsp
     <%
         // suppose we have a text called 'test.md' and we are in a template, special page, or part
@@ -113,6 +113,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
     ```
   [0371d41](https://github.com/JesseBrault0709/ssg/commit/0371d41).
 - The `text` object in Templates is now an instance of [`EmbeddableText`](lib/src/main/groovy/com/jessebrault/ssg/text/EmbeddableText.groovy) instead of `String`. Thus, one must use `text.render()` to obtain the rendered text. [34d9cd5](https://github.com/JesseBrault0709/ssg/commit/34d9cd5).
-
-### Deprecated
-- The `frontMatter` object in Templates is now deprecated. Use `text.frontMatter` instead. [eafc8cd](https://github.com/JesseBrault0709/ssg/commit/eafc8cd).
+- The `frontMatter` object is no longer available. Use `text.frontMatter` instead. [eafc8cd](https://github.com/JesseBrault0709/ssg/commit/eafc8cd), [c5ac810](https://github.com/JesseBrault0709/ssg/commit/c5ac810).

From 107f394b820ed186cde1750dff8d31f9d1e54178 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Mon, 20 Feb 2023 11:53:02 +0100
Subject: [PATCH 31/36] Started docs.

---
 build.gradle                  | 11 +++++++++++
 docs/asciidoc/manual.asciidoc | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 build.gradle
 create mode 100644 docs/asciidoc/manual.asciidoc

diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..663921b
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,11 @@
+plugins {
+    id 'org.asciidoctor.jvm.convert' version '3.3.2'
+}
+
+repositories {
+    mavenCentral()
+}
+
+asciidoctor {
+    sourceDir = 'docs/asciidoc'
+}
\ No newline at end of file
diff --git a/docs/asciidoc/manual.asciidoc b/docs/asciidoc/manual.asciidoc
new file mode 100644
index 0000000..3bd22a1
--- /dev/null
+++ b/docs/asciidoc/manual.asciidoc
@@ -0,0 +1,19 @@
+= com.jessebrault.ssg
+Jesse Brault
+v0.1.0
+:toc:
+:source-highlighter: rouge
+
+*com.jessebrault.ssg* is a static site generator written in Groovy, giving access to the entire JVM ecosystem through its templating system.
+
+== Some Examples
+
+.Tag Builder
+[source,groovy]
+----
+def a = tagBuilder.a(href: 'hello.html', 'Hello!') // <1>
+assert a == '<a href="hello.html">Hello!</a>'
+out << a // <2>
+----
+<1> Create an <a> tag.
+<2> Output the tag in the current script block.
\ No newline at end of file

From 92c810870cf9b7a5232e0f98a25f685cdb28fa82 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:26:37 +0100
Subject: [PATCH 32/36] Major refactoring and introduction of Task model.

---
 .../ssg/AbstractBuildCommand.groovy           |  25 ++-
 .../groovy/com/jessebrault/ssg/Result.groovy  |  28 ++++
 .../ssg/SimpleStaticSiteGenerator.groovy      | 145 ++----------------
 .../ssg/StaticSiteGenerator.groovy            |   4 +-
 .../jessebrault/ssg/dsl/StandardDslMap.groovy |   1 +
 .../ssg/renderer/RenderContext.groovy         |   4 +
 .../ssg/specialpage/SpecialPage.groovy        |  11 +-
 .../jessebrault/ssg/task/AbstractTask.groovy  |  31 ++++
 .../com/jessebrault/ssg/task/FileInput.groovy |   5 +
 .../jessebrault/ssg/task/FileOutput.groovy    |   6 +
 .../ssg/task/HtmlFileOutput.groovy            |  26 ++++
 .../com/jessebrault/ssg/task/Input.groovy     |   2 +-
 .../com/jessebrault/ssg/task/Output.groovy    |  19 +--
 .../jessebrault/ssg/task/OutputMetaMap.groovy |  19 ---
 .../ssg/task/SpecialPageToHtmlFileTask.groovy |  50 ++++++
 .../SpecialPageToHtmlFileTaskFactory.groovy   |  82 ++++++++++
 .../com/jessebrault/ssg/task/Task.groovy      |   4 +-
 .../ssg/task/TaskCollection.groovy            |  24 +++
 .../jessebrault/ssg/task/TaskContainer.groovy |   9 ++
 .../jessebrault/ssg/task/TaskContext.groovy   |  21 ---
 .../jessebrault/ssg/task/TaskExecutor.groovy  |   5 +
 .../ssg/task/TaskExecutorContext.groovy       |  23 +++
 .../jessebrault/ssg/task/TaskFactory.groovy   |   7 +-
 .../{OutputMeta.groovy => TaskType.groovy}    |  10 +-
 .../ssg/task/TaskTypeContainer.groovy         |  36 +++++
 .../com/jessebrault/ssg/task/TextInput.groovy |  14 ++
 .../ssg/task/TextToHtmlFileTask.groovy        |  50 ++++++
 .../ssg/task/TextToHtmlFileTaskFactory.groovy | 112 ++++++++++++++
 .../com/jessebrault/ssg/task/WithInput.groovy |   5 +
 .../jessebrault/ssg/task/WithOutput.groovy    |   5 +
 .../com/jessebrault/ssg/text/Text.groovy      |  11 +-
 ...StaticSiteGeneratorIntegrationTests.groovy |  61 ++++++--
 .../ssg/text/ExcerptGetterTests.groovy        |   9 +-
 .../ssg/dsl/StandardDslConsumerTests.groovy   |  49 ++++++
 .../ssg/specialpage/SpecialPageMocks.groovy   |  16 ++
 .../SpecialPageToHtmlFileTaskMocks.groovy     |  19 +++
 .../ssg/task/TextToHtmlFileTaskMocks.groovy   |  19 +++
 .../ssg/testutil/DiagnosticsUtil.groovy       |   5 +
 .../ssg/testutil/RenderContextUtil.groovy     |   6 +-
 .../com/jessebrault/ssg/text/TextMocks.groovy |   4 +-
 40 files changed, 742 insertions(+), 240 deletions(-)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/Result.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/AbstractTask.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/FileInput.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/FileOutput.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/HtmlFileOutput.groovy
 delete mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskContainer.groovy
 delete mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutor.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutorContext.groovy
 rename lib/src/main/groovy/com/jessebrault/ssg/task/{OutputMeta.groovy => TaskType.groovy} (57%)
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TextInput.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/WithInput.groovy
 create mode 100644 lib/src/main/groovy/com/jessebrault/ssg/task/WithOutput.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/specialpage/SpecialPageMocks.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskMocks.groovy
 create mode 100644 lib/src/testFixtures/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskMocks.groovy

diff --git a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
index 60b8182..d56c0cc 100644
--- a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
+++ b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
@@ -8,6 +8,7 @@ import com.jessebrault.ssg.part.PartType
 import com.jessebrault.ssg.specialpage.GspSpecialPageRenderer
 import com.jessebrault.ssg.specialpage.SpecialPageFileSpecialPagesProvider
 import com.jessebrault.ssg.specialpage.SpecialPageType
+import com.jessebrault.ssg.task.TaskExecutorContext
 import com.jessebrault.ssg.template.GspTemplateRenderer
 import com.jessebrault.ssg.template.TemplateFileTemplatesProvider
 import com.jessebrault.ssg.template.TemplateType
@@ -80,16 +81,28 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
         // Do each build
         this.builds.each {
             def result = this.ssg.generate(it)
-            if (result.v1.size() > 0) {
+            if (result.hasDiagnostics()) {
                 hadDiagnostics = true
-                result.v1.each {
+                result.diagnostics.each {
                     logger.error(it.message)
                 }
             } else {
-                result.v2.each { Output output ->
-                    def target = new File(it.outDir, output.meta.targetPath)
-                    target.createParentDirectories()
-                    target.write(output.content)
+                def tasks = result.get()
+                Collection<Diagnostic> executionDiagnostics = []
+                def context = new TaskExecutorContext(
+                        it,
+                        tasks,
+                        null,
+                        { Collection<Diagnostic> diagnostics ->
+                            executionDiagnostics.addAll(diagnostics)
+                        }
+                )
+                result.get().each { it.execute(context) }
+                if (!executionDiagnostics.isEmpty()) {
+                    hadDiagnostics = true
+                    executionDiagnostics.each {
+                        logger.error(it.message)
+                    }
                 }
             }
         }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/Result.groovy b/lib/src/main/groovy/com/jessebrault/ssg/Result.groovy
new file mode 100644
index 0000000..94702bd
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/Result.groovy
@@ -0,0 +1,28 @@
+package com.jessebrault.ssg
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(defaults = false, includeFields = true)
+@NullCheck(includeGenerated = true)
+@EqualsAndHashCode
+final class Result<T> {
+
+    final Collection<Diagnostic> diagnostics
+    private final T t
+
+    boolean hasDiagnostics() {
+        !this.diagnostics.isEmpty()
+    }
+
+    T get() {
+        this.t
+    }
+
+    @Override
+    String toString() {
+        "Result(diagnostics: ${ this.diagnostics }, t: ${ this.t })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
index cdd50dd..ca0583b 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
@@ -1,25 +1,15 @@
 package com.jessebrault.ssg
 
-import com.jessebrault.ssg.renderer.RenderContext
-import com.jessebrault.ssg.specialpage.SpecialPage
-import com.jessebrault.ssg.task.Output
-import com.jessebrault.ssg.task.OutputMeta
-import com.jessebrault.ssg.task.OutputMetaMap
-import com.jessebrault.ssg.text.FrontMatter
-import com.jessebrault.ssg.text.Text
-import groovy.transform.EqualsAndHashCode
+import com.jessebrault.ssg.task.SpecialPageToHtmlFileTaskFactory
+import com.jessebrault.ssg.task.TaskContainer
+import com.jessebrault.ssg.task.TextToHtmlFileTaskFactory
 import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.slf4j.Marker
 import org.slf4j.MarkerFactory
 
-import static com.jessebrault.ssg.util.ExtensionsUtil.stripExtension
-
-@TupleConstructor(includeFields = true)
 @NullCheck
-@EqualsAndHashCode(includeFields = true)
 class SimpleStaticSiteGenerator implements StaticSiteGenerator {
 
     private static final Logger logger = LoggerFactory.getLogger(SimpleStaticSiteGenerator)
@@ -27,128 +17,25 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
     private static final Marker exit = MarkerFactory.getMarker('EXIT')
 
     @Override
-    Tuple2<Collection<Diagnostic>, Collection<Output>> generate(Build build) {
+    Result<TaskContainer> generate(Build build) {
         logger.trace(enter, 'build: {}', build)
         logger.info('processing build with name: {}', build.name)
 
-        def config = build.config
-        def siteSpec = build.siteSpec
+        def tasks = new TaskContainer()
+        def diagnostics = []
 
-        // Get all texts, templates, parts, and specialPages
-        def texts = config.textProviders.collectMany { it.provide() }
-        def templates = config.templatesProviders.collectMany { it.provide() }
-        def parts = config.partsProviders.collectMany { it.provide() }
-        def specialPages = config.specialPagesProviders.collectMany { it.provide() }
+        def textToHtmlFactory = new TextToHtmlFileTaskFactory()
+        def textsResult = textToHtmlFactory.getTasks(build)
+        tasks.addAll(textsResult.get())
+        diagnostics.addAll(textsResult.diagnostics)
 
-        logger.debug('\n\ttexts: {}\n\ttemplates: {}\n\tparts: {}\n\tspecialPages: {}', texts, templates, parts, specialPages)
+        def specialPageToHtmlFactory = new SpecialPageToHtmlFileTaskFactory()
+        def specialPagesResult = specialPageToHtmlFactory.getTasks(build)
+        tasks.addAll(specialPagesResult.get())
+        diagnostics.addAll(specialPagesResult.diagnostics)
 
-        def globals = build.globals
-        Collection<Diagnostic> diagnostics = []
-        Collection<Output> generatedPages = []
-
-        Map<Text, OutputMeta> textOutputTasks = texts.collectEntries {
-            [(it): new OutputMeta(it.path, stripExtension(it.path) + '.html')]
-        }
-        Map<SpecialPage, OutputMeta> specialPageOutputTasks = specialPages.collectEntries {
-            [(it): new OutputMeta(it.path, stripExtension(it.path) + '.html')]
-        }
-
-        def textOutputMetas = textOutputTasks.values() as ArrayList
-        def specialPageOutputMetas = specialPageOutputTasks.values() as ArrayList
-        def outputMetaMap = new OutputMetaMap([*textOutputMetas, *specialPageOutputMetas])
-
-        // Generate pages from each text, but only those that have a 'template' frontMatter field with a valid value
-        textOutputTasks.each { text, outputMeta ->
-            logger.trace(enter, 'text: {}, outputMeta: {}', text, outputMeta)
-            logger.info('processing text: {}', text.path)
-
-            // Extract frontMatter from text
-            def frontMatterResult = text.type.frontMatterGetter.get(text)
-            FrontMatter frontMatter
-            if (frontMatterResult.v1.size() > 0) {
-                logger.debug('diagnostics for getting frontMatter for {}: {}', text.path, frontMatterResult.v1)
-                diagnostics.addAll(frontMatterResult.v1)
-                logger.trace(exit, '')
-                return
-            } else {
-                frontMatter = frontMatterResult.v2
-                logger.debug('frontMatter: {}', frontMatter)
-            }
-
-            // Find the appropriate template from the frontMatter
-            def desiredTemplate = frontMatter.find('template')
-            if (desiredTemplate.isEmpty()) {
-                logger.info('{} has no \'template\' key in its frontMatter; skipping generation', text)
-                return
-            }
-            def template = templates.find { it.path == desiredTemplate.get() }
-            if (template == null) {
-                diagnostics << new Diagnostic('in textFile' + text.path + ' frontMatter.template references an unknown template: ' + desiredTemplate, null)
-                logger.trace(exit, '')
-                return
-            }
-            logger.debug('found template: {}', template)
-
-            // Render the template using the result of rendering the text earlier
-            def templateRenderResult = template.type.renderer.render(
-                    template,
-                    text,
-                    new RenderContext(
-                            config,
-                            siteSpec,
-                            globals,
-                            texts,
-                            parts,
-                            outputMeta.sourcePath,
-                            outputMeta.targetPath
-                    )
-            )
-            String renderedTemplate
-            if (templateRenderResult.v1.size() > 0) {
-                diagnostics.addAll(templateRenderResult.v1)
-                logger.trace(exit, '')
-                return
-            } else {
-                renderedTemplate = templateRenderResult.v2
-            }
-
-            // Create a GeneratedPage
-            generatedPages << new Output(outputMeta, renderedTemplate)
-            return
-        }
-
-        // Generate special pages
-        specialPageOutputTasks.each { specialPage, outputMeta ->
-            logger.info('processing specialPage: {}', specialPage.path)
-
-            def specialPageRenderResult = specialPage.type.renderer.render(
-                    specialPage,
-                    new RenderContext(
-                            config,
-                            siteSpec,
-                            globals,
-                            texts,
-                            parts,
-                            outputMeta.sourcePath,
-                            outputMeta.targetPath
-                    )
-            )
-            String renderedSpecialPage
-            if (specialPageRenderResult.v1.size() > 0) {
-                diagnostics.addAll(specialPageRenderResult.v1)
-                logger.trace(exit, '')
-                return
-            } else {
-                renderedSpecialPage = specialPageRenderResult.v2
-            }
-
-            // Create a GeneratedPage
-            generatedPages << new Output(outputMeta, renderedSpecialPage)
-            return
-        }
-
-        logger.trace(exit, '\n\tdiagnostics: {}\n\tgeneratedPages: {}', diagnostics, generatedPages)
-        new Tuple2<>(diagnostics, generatedPages)
+        logger.trace(exit, '\n\tdiagnostics: {}\n\ttasks: {}', diagnostics, tasks)
+        new Result<>(diagnostics, tasks)
     }
 
     @Override
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
index 4ab5504..b6e2844 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
@@ -1,7 +1,7 @@
 package com.jessebrault.ssg
 
-import com.jessebrault.ssg.task.Output
+import com.jessebrault.ssg.task.TaskContainer
 
 interface StaticSiteGenerator {
-    Tuple2<Collection<Diagnostic>, Collection<Output>> generate(Build build)
+    Result<TaskContainer> generate(Build build)
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
index bbc27e8..2443030 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
@@ -58,6 +58,7 @@ final class StandardDslMap {
             it.siteSpec = context.siteSpec
             it.sourcePath = context.sourcePath
             it.targetPath = context.targetPath
+            it.tasks = context.tasks
             it.text = b.text ? new EmbeddableText(
                     b.text,
                     context.globals,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy b/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
index 5829210..fcc763a 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
@@ -3,6 +3,8 @@ package com.jessebrault.ssg.renderer
 import com.jessebrault.ssg.Config
 import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.Part
+import com.jessebrault.ssg.task.Task
+import com.jessebrault.ssg.task.TaskContainer
 import com.jessebrault.ssg.text.Text
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
@@ -19,4 +21,6 @@ final class RenderContext {
     final Collection<Part> parts
     final String sourcePath
     final String targetPath
+    final TaskContainer tasks
+    final Set<Class<? extends Task>> taskTypes
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
index 55f1cd5..d1af35d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/specialpage/SpecialPage.groovy
@@ -1,18 +1,17 @@
 package com.jessebrault.ssg.specialpage
 
-import com.jessebrault.ssg.task.Input
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
 
 @TupleConstructor(defaults = false)
-@NullCheck
+@NullCheck(includeGenerated = true)
 @EqualsAndHashCode
-class SpecialPage implements Input {
+final class SpecialPage {
 
-    String text
-    String path
-    SpecialPageType type
+    final String text
+    final String path
+    final SpecialPageType type
 
     @Override
     String toString() {
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/AbstractTask.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/AbstractTask.groovy
new file mode 100644
index 0000000..bfc3565
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/AbstractTask.groovy
@@ -0,0 +1,31 @@
+package com.jessebrault.ssg.task
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+
+@NullCheck
+@EqualsAndHashCode
+abstract class AbstractTask<T extends Task> implements Task {
+
+    final TaskType<T> type
+    final String name
+
+    AbstractTask(TaskType<T> type, String name) {
+        this.type = type
+        this.name = name
+    }
+
+    protected abstract T getThis()
+
+    @Override
+    void execute(TaskExecutorContext context) {
+        // I am guessing that if we put this.getThis(), it will think the runtime type is AbstractTask? Not sure.
+        this.type.executor.execute(getThis(), context)
+    }
+
+    @Override
+    String toString() {
+        "AbstractTask(name: ${ this.name }, type: ${ this.type })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/FileInput.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/FileInput.groovy
new file mode 100644
index 0000000..496b2fa
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/FileInput.groovy
@@ -0,0 +1,5 @@
+package com.jessebrault.ssg.task
+
+interface FileInput extends Input {
+    File getFile()
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/FileOutput.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/FileOutput.groovy
new file mode 100644
index 0000000..34bd660
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/FileOutput.groovy
@@ -0,0 +1,6 @@
+package com.jessebrault.ssg.task
+
+interface FileOutput extends Output {
+    File getFile()
+    String getContent()
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/HtmlFileOutput.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/HtmlFileOutput.groovy
new file mode 100644
index 0000000..bf69c28
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/HtmlFileOutput.groovy
@@ -0,0 +1,26 @@
+package com.jessebrault.ssg.task
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(defaults = false, includeFields = true)
+@NullCheck(includeGenerated = true)
+@EqualsAndHashCode
+final class HtmlFileOutput {
+
+    final File file
+    final String htmlPath
+
+    private final Closure<String> contentClosure
+
+    String getContent(TaskContainer tasks, TaskTypeContainer taskTypes, Closure onDiagnostics) {
+        this.contentClosure(tasks, taskTypes, onDiagnostics)
+    }
+
+    @Override
+    String toString() {
+        "HtmlFileOutput(file: ${ this.file }, htmlPath: ${ this.htmlPath })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy
index 39f606b..ac7ff57 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/Input.groovy
@@ -1,5 +1,5 @@
 package com.jessebrault.ssg.task
 
 interface Input {
-    String getPath()
+    String getName()
 }
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy
index 63f7c53..f03dcda 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/Output.groovy
@@ -1,20 +1,5 @@
 package com.jessebrault.ssg.task
 
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-
-@TupleConstructor(defaults = false)
-@NullCheck
-@EqualsAndHashCode
-final class Output {
-
-    final OutputMeta meta
-    final String content
-
-    @Override
-    String toString() {
-        "Output(meta: ${ this.meta })"
-    }
-
+interface Output {
+    String getName()
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy
deleted file mode 100644
index ed24f37..0000000
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMetaMap.groovy
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.jessebrault.ssg.task
-
-final class OutputMetaMap {
-
-    @Delegate
-    private final Map<String, OutputMeta> map = [:]
-
-    OutputMetaMap(Collection<OutputMeta> outputMetas) {
-        outputMetas.each {
-            this.put(it.sourcePath, it)
-        }
-    }
-
-    @Override
-    String toString() {
-        "OutputMetaMap(map: ${ this.map })"
-    }
-
-}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
new file mode 100644
index 0000000..4ae3749
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
@@ -0,0 +1,50 @@
+package com.jessebrault.ssg.task
+
+import com.jessebrault.ssg.specialpage.SpecialPage
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+
+@NullCheck
+@EqualsAndHashCode
+final class SpecialPageToHtmlFileTask extends AbstractTask<SpecialPageToHtmlFileTask> {
+
+    private static final class SpecialPageToHtmlFileTaskExecutor implements TaskExecutor<SpecialPageToHtmlFileTask> {
+
+        @Override
+        void execute(SpecialPageToHtmlFileTask task, TaskExecutorContext context) {
+            task.output.file.write(task.output.getContent(
+                    context.allTasks, context.allTypes, context.onDiagnostics
+            ))
+        }
+
+        @Override
+        String toString() {
+            'SpecialPageToHtmlFileTaskExecutor()'
+        }
+
+    }
+
+    private static final TaskType<SpecialPageToHtmlFileTask> type = new TaskType<>(
+            'specialPageToHtmlFile', new SpecialPageToHtmlFileTaskExecutor()
+    )
+
+    final SpecialPage input
+    final HtmlFileOutput output
+
+    SpecialPageToHtmlFileTask(String name, SpecialPage input, HtmlFileOutput output) {
+        super(type, name)
+        this.input = input
+        this.output = output
+    }
+
+    @Override
+    protected SpecialPageToHtmlFileTask getThis() {
+        this
+    }
+
+    @Override
+    String toString() {
+        "SpecialPageToHtmlFileTask(input: ${ this.input }, output: ${ this.output }, super: ${ super })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy
new file mode 100644
index 0000000..a59878b
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy
@@ -0,0 +1,82 @@
+package com.jessebrault.ssg.task
+
+import com.jessebrault.ssg.Build
+import com.jessebrault.ssg.Result
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.util.ExtensionsUtil
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.slf4j.Marker
+import org.slf4j.MarkerFactory
+
+final class SpecialPageToHtmlFileTaskFactory implements TaskFactory<SpecialPageToHtmlFileTask> {
+
+    private static final Logger logger = LoggerFactory.getLogger(SpecialPageToHtmlFileTaskFactory)
+    private static final Marker enter = MarkerFactory.getMarker('ENTER')
+    private static final Marker exit = MarkerFactory.getMarker('EXIT')
+
+    @Override
+    Result<TaskCollection<SpecialPageToHtmlFileTask>> getTasks(Build build) {
+        logger.trace(enter, 'build: {}', build)
+        logger.info('processing build with name {} for SpecialPageToHtmlFileTasks', build.name)
+
+        def config = build.config
+        def siteSpec = build.siteSpec
+        def globals = build.globals
+
+        def specialPages = config.specialPagesProviders.collectMany { it.provide() }
+        def templates = config.templatesProviders.collectMany { it.provide() }
+        def parts = config.partsProviders.collectMany { it.provide() }
+        def texts = config.textProviders.collectMany { it.provide() }
+
+        logger.debug('\n\tspecialPages: {}\n\ttemplates: {}\n\tparts: {}', specialPages, templates, parts)
+
+        def tasks = new TaskCollection<SpecialPageToHtmlFileTask>(specialPages.findResults {
+            logger.trace(enter, 'specialPage: {}', it)
+            logger.info('processing specialPage with path: {}', it.path)
+
+            def htmlPath = ExtensionsUtil.stripExtension(it.path) + '.html'
+
+            def renderSpecialPage = { TaskContainer tasks, TaskTypeContainer taskTypes, Closure<Void> onDiagnostics ->
+                def renderResult = it.type.renderer.render(
+                        it,
+                        new RenderContext(
+                                config,
+                                siteSpec,
+                                globals,
+                                texts,
+                                parts,
+                                it.path,
+                                htmlPath,
+                                tasks,
+                                taskTypes
+                        )
+                )
+
+                if (!renderResult.v1.isEmpty()) {
+                    onDiagnostics(renderResult.v1)
+                    ''
+                } else {
+                    renderResult.v2
+                }
+            }
+
+            def result = new SpecialPageToHtmlFileTask(
+                    "specialPageToHtmlFileTask:${ it.path }:${ htmlPath }",
+                    it,
+                    new HtmlFileOutput(
+                            new File(build.outDir, htmlPath),
+                            htmlPath,
+                            renderSpecialPage
+                    )
+            )
+            logger.trace(exit, 'result: {}', result)
+            result
+        })
+
+        def result = new Result<>([], tasks)
+        logger.trace(exit, 'result: {}', result)
+        result
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
index 49a217a..6ee1e7b 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
@@ -1,6 +1,6 @@
 package com.jessebrault.ssg.task
 
 interface Task {
-    Output getOutput()
-    OutputMeta getOutputMeta()
+    String getName()
+    void execute(TaskExecutorContext context)
 }
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy
new file mode 100644
index 0000000..856fd2c
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy
@@ -0,0 +1,24 @@
+package com.jessebrault.ssg.task
+
+import static java.util.Objects.requireNonNull
+
+class TaskCollection<T extends Task> {
+
+    @Delegate
+    private final Collection<T> tasks = new ArrayList<T>()
+
+    TaskCollection(Collection<? extends T> tasks = null) {
+        if (tasks != null) {
+            this.tasks.addAll(requireNonNull(tasks))
+        }
+    }
+
+    def <U extends T> TaskCollection<U> findAllByType(
+            Class<U> taskClass
+    ) {
+        new TaskCollection<>(this.tasks.findResults {
+            taskClass.isAssignableFrom(it.class) ? taskClass.cast(it) : null
+        })
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContainer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContainer.groovy
new file mode 100644
index 0000000..3661476
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContainer.groovy
@@ -0,0 +1,9 @@
+package com.jessebrault.ssg.task
+
+final class TaskContainer extends TaskCollection<Task> {
+
+    TaskContainer(Collection<? extends Task> tasks = null) {
+        super(tasks)
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy
deleted file mode 100644
index 18b4067..0000000
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskContext.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jessebrault.ssg.task
-
-import com.jessebrault.ssg.Config
-import com.jessebrault.ssg.SiteSpec
-import groovy.transform.TupleConstructor
-import groovy.transform.builder.Builder
-
-@Builder
-@TupleConstructor(defaults = false)
-final class TaskContext {
-
-    final Config config
-    final SiteSpec siteSpec
-    final Collection<OutputMeta> outputMetas
-
-    @Override
-    String toString() {
-        "TaskContext(config: ${ this.config }, siteSpec: ${ this.siteSpec }, outputMetas: ${ this.outputMetas })"
-    }
-
-}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutor.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutor.groovy
new file mode 100644
index 0000000..35cb769
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutor.groovy
@@ -0,0 +1,5 @@
+package com.jessebrault.ssg.task
+
+interface TaskExecutor<T extends Task> {
+    void execute(T task, TaskExecutorContext context)
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutorContext.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutorContext.groovy
new file mode 100644
index 0000000..a1da7b1
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskExecutorContext.groovy
@@ -0,0 +1,23 @@
+package com.jessebrault.ssg.task
+
+import com.jessebrault.ssg.Build
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(defaults = false)
+@NullCheck(includeGenerated = true)
+@EqualsAndHashCode
+final class TaskExecutorContext {
+
+    final Build build
+    final TaskContainer allTasks
+    final TaskTypeContainer allTypes
+    final Closure onDiagnostics
+
+    @Override
+    String toString() {
+        "TaskExecutorContext(build: ${ this.build }, allTasks: ${ this.allTasks }, allTypes: ${ this.allTypes })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
index bb1ec80..b538653 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
@@ -1,7 +1,8 @@
 package com.jessebrault.ssg.task
 
-import org.jetbrains.annotations.Nullable
+import com.jessebrault.ssg.Build
+import com.jessebrault.ssg.Result
 
-interface TaskFactory {
-    @Nullable Task getTask(Input input, TaskContext context)
+interface TaskFactory<T extends Task> {
+    Result<TaskCollection<T>> getTasks(Build build)
 }
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMeta.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskType.groovy
similarity index 57%
rename from lib/src/main/groovy/com/jessebrault/ssg/task/OutputMeta.groovy
rename to lib/src/main/groovy/com/jessebrault/ssg/task/TaskType.groovy
index d8adecf..2b2652b 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/OutputMeta.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskType.groovy
@@ -5,16 +5,16 @@ import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
 
 @TupleConstructor(defaults = false)
-@NullCheck
+@NullCheck(includeGenerated = true)
 @EqualsAndHashCode
-final class OutputMeta {
+final class TaskType<T extends Task> {
 
-    final String sourcePath
-    final String targetPath
+    final String name
+    final TaskExecutor<T> executor
 
     @Override
     String toString() {
-        "OutputMeta(sourcePath: ${ sourcePath }, targetPath: ${ targetPath })"
+        "TaskType(${ this.name }, ${ this.executor })"
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy
new file mode 100644
index 0000000..cb1365d
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy
@@ -0,0 +1,36 @@
+package com.jessebrault.ssg.task
+
+import java.util.regex.Pattern
+
+final class TaskTypeContainer {
+
+    private static final Pattern taskTypeNamePattern = ~/(.*)Task/
+
+    @Delegate
+    private final Set<Class<? extends Task>> taskTypes = []
+
+    TaskTypeContainer(Collection<Class<? extends Task>> taskTypes = null) {
+        if (taskTypes) {
+            this.taskTypes.addAll(taskTypes)
+        }
+    }
+
+    @Override
+    Class<? extends Task> getProperty(String propertyName) {
+        def result = this.taskTypes.find {
+            def m = taskTypeNamePattern.matcher(it.simpleName)
+            if (m.matches()) {
+                def withoutTaskEnd = m.group(1)
+                def uncapitalized = withoutTaskEnd.uncapitalize()
+                return propertyName == uncapitalized
+            } else {
+                throw new IllegalStateException("invalid task type name: ${ it.simpleName }")
+            }
+        }
+        if (!result) {
+            throw new IllegalStateException("no such taskType: ${ propertyName }")
+        }
+        result
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TextInput.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TextInput.groovy
new file mode 100644
index 0000000..beed338
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TextInput.groovy
@@ -0,0 +1,14 @@
+package com.jessebrault.ssg.task
+
+import com.jessebrault.ssg.text.Text
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+
+@TupleConstructor(defaults = false)
+@NullCheck(includeGenerated = true)
+@EqualsAndHashCode
+final class TextInput implements Input {
+    final String name
+    final Text text
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
new file mode 100644
index 0000000..42883f0
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
@@ -0,0 +1,50 @@
+package com.jessebrault.ssg.task
+
+import com.jessebrault.ssg.text.Text
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.NullCheck
+
+@NullCheck
+@EqualsAndHashCode(callSuper = true)
+final class TextToHtmlFileTask extends AbstractTask<TextToHtmlFileTask> {
+
+    private static final class TextToHtmlFileTaskExecutor implements TaskExecutor<TextToHtmlFileTask> {
+
+        @Override
+        void execute(TextToHtmlFileTask task, TaskExecutorContext context) {
+            task.output.file.write(task.output.getContent(
+                    context.allTasks, context.allTypes, context.onDiagnostics
+            ))
+        }
+
+        @Override
+        String toString() {
+            'TextToHtmlFileTaskExecutor()'
+        }
+
+    }
+
+    private static final TaskType<TextToHtmlFileTask> type = new TaskType<>(
+            'textToHtmlFile', new TextToHtmlFileTaskExecutor()
+    )
+
+    final Text input
+    final HtmlFileOutput output
+
+    TextToHtmlFileTask(String name, Text input, HtmlFileOutput output) {
+        super(type, name)
+        this.input = input
+        this.output = output
+    }
+
+    @Override
+    protected TextToHtmlFileTask getThis() {
+        this
+    }
+
+    @Override
+    String toString() {
+        "TextToHtmlFileTask(input: ${ this.input }, output: ${ this.output }, super: ${ super })"
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy
new file mode 100644
index 0000000..bfe3298
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy
@@ -0,0 +1,112 @@
+package com.jessebrault.ssg.task
+
+import com.jessebrault.ssg.Build
+import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.Result
+import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.text.FrontMatter
+import com.jessebrault.ssg.util.ExtensionsUtil
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.slf4j.Marker
+import org.slf4j.MarkerFactory
+
+final class TextToHtmlFileTaskFactory implements TaskFactory<TextToHtmlFileTask> {
+
+    private static final Logger logger = LoggerFactory.getLogger(TextToHtmlFileTaskFactory)
+    private static final Marker enter = MarkerFactory.getMarker('ENTER')
+    private static final Marker exit = MarkerFactory.getMarker('EXIT')
+
+    @Override
+    Result<TaskCollection<TextToHtmlFileTask>> getTasks(Build build) {
+        logger.trace(enter, 'build: {}', build)
+        logger.info('getting TextToHtmlFileTasks for build with name: {}', build.name)
+
+        def config = build.config
+        def siteSpec = build.siteSpec
+        def globals = build.globals
+        def diagnostics = []
+
+        // Get all texts, templates, parts, and specialPages
+        def texts = config.textProviders.collectMany { it.provide() }
+        def templates = config.templatesProviders.collectMany { it.provide() }
+        def parts = config.partsProviders.collectMany { it.provide() }
+
+        logger.debug('\n\ttexts: {}\n\ttemplates: {}\n\tparts: {}', texts, templates, parts)
+
+        def tasks = new TaskCollection<TextToHtmlFileTask>(texts.findResults {
+            logger.trace(enter, 'text: {}', it)
+            logger.info('processing text with path: {}', it.path)
+
+            def frontMatterResult = it.type.frontMatterGetter.get(it)
+            FrontMatter frontMatter
+            if (!frontMatterResult.v1.isEmpty()) {
+                diagnostics.addAll(frontMatterResult.v1)
+                logger.trace(exit, 'result: {}', null)
+                return null
+            } else {
+                frontMatter = frontMatterResult.v2
+                logger.debug('frontMatter: {}', frontMatter)
+            }
+
+            def desiredTemplate = frontMatter.find('template')
+            if (desiredTemplate.isEmpty()) {
+                logger.info('text with path {} has no \'template\' key in its frontMatter; skipping', it.path)
+                logger.trace(exit, 'result: {}', null)
+                return null
+            }
+            def template = templates.find { it.path == desiredTemplate.get() }
+            if (template == null) {
+                diagnostics << new Diagnostic("in text with path ${ it.path }, frontMatter.template refers to an unknown template: ${ desiredTemplate.get() }")
+                logger.trace(exit, 'result: {}', null)
+                return null
+            }
+            logger.debug('found template: {}', template)
+
+            def htmlPath = ExtensionsUtil.stripExtension(it.path) + '.html'
+
+            def renderTemplate = { TaskContainer tasks, TaskTypeContainer taskTypes, Closure<Void> onDiagnostics ->
+                def templateRenderResult = template.type.renderer.render(
+                        template,
+                        it,
+                        new RenderContext(
+                                config,
+                                siteSpec,
+                                globals,
+                                texts,
+                                parts,
+                                it.path,
+                                htmlPath,
+                                tasks,
+                                taskTypes
+                        )
+                )
+
+                if (!templateRenderResult.v1.isEmpty()) {
+                    onDiagnostics(templateRenderResult.v1)
+                    ''
+                } else {
+                    templateRenderResult.v2
+                }
+            }
+
+            def result = new TextToHtmlFileTask(
+                    "textToHtmlFileTask:${ it.path }:${ htmlPath }",
+                    it,
+                    new HtmlFileOutput(
+                            new File(build.outDir, htmlPath),
+                            htmlPath,
+                            renderTemplate
+                    )
+            )
+
+            logger.trace(exit, 'result: {}', result)
+            result
+        })
+
+        def result = new Result<>(diagnostics, tasks)
+        logger.trace(exit, 'result: {}', result)
+        result
+    }
+
+}
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/WithInput.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/WithInput.groovy
new file mode 100644
index 0000000..7482c8a
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/WithInput.groovy
@@ -0,0 +1,5 @@
+package com.jessebrault.ssg.task
+
+interface WithInput<I extends Input> {
+    I getInput()
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/WithOutput.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/WithOutput.groovy
new file mode 100644
index 0000000..b181686
--- /dev/null
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/WithOutput.groovy
@@ -0,0 +1,5 @@
+package com.jessebrault.ssg.task
+
+interface WithOutput<O extends Output> {
+    O getOutput()
+}
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy b/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
index cdafa2a..2231f5d 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/text/Text.groovy
@@ -1,18 +1,17 @@
 package com.jessebrault.ssg.text
 
-import com.jessebrault.ssg.task.Input
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
 import groovy.transform.TupleConstructor
 
 @TupleConstructor(defaults = false)
-@NullCheck
+@NullCheck(includeGenerated = true)
 @EqualsAndHashCode
-class Text implements Input {
+final class Text {
 
-    String text
-    String path
-    TextType type
+    final String text
+    final String path
+    final TextType type
 
     @Override
     String toString() {
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
index 2fc99a7..1fc7159 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
@@ -6,6 +6,10 @@ import com.jessebrault.ssg.part.PartType
 import com.jessebrault.ssg.specialpage.GspSpecialPageRenderer
 import com.jessebrault.ssg.specialpage.SpecialPageFileSpecialPagesProvider
 import com.jessebrault.ssg.specialpage.SpecialPageType
+import com.jessebrault.ssg.task.SpecialPageToHtmlFileTask
+import com.jessebrault.ssg.task.Task
+import com.jessebrault.ssg.task.TaskTypeContainer
+import com.jessebrault.ssg.task.TextToHtmlFileTask
 import com.jessebrault.ssg.template.GspTemplateRenderer
 import com.jessebrault.ssg.template.TemplateFileTemplatesProvider
 import com.jessebrault.ssg.template.TemplateType
@@ -18,6 +22,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
+import static com.jessebrault.ssg.testutil.DiagnosticsUtil.getDiagnosticsMessageSupplier
 import static org.junit.jupiter.api.Assertions.*
 
 class SimpleStaticSiteGeneratorIntegrationTests {
@@ -68,11 +73,15 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         def result = this.ssg.generate(this.build)
 
         assertEmptyDiagnostics(result)
-        assertTrue(result.v2.size() == 1)
+        def tasks = result.get()
+        assertTrue(tasks.size() == 1)
 
-        def p0 = result.v2[0]
-        assertEquals('test.html', p0.meta.targetPath)
-        assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.content)
+        def t0 = tasks.findAllByType(TextToHtmlFileTask)[0]
+        assertEquals('test.html', t0.output.htmlPath)
+        def contentResult = t0.output.getContent(tasks, new TaskTypeContainer([TextToHtmlFileTask])) { Collection<Diagnostic> diagnostics ->
+            fail(getDiagnosticsMessageSupplier(diagnostics))
+        }
+        assertEquals('<p><strong>Hello, World!</strong></p>\n', contentResult)
     }
 
     @Test
@@ -88,11 +97,18 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         def result = this.ssg.generate(this.build)
 
         assertEmptyDiagnostics(result)
-        assertTrue(result.v2.size() == 1)
+        def tasks = result.get()
+        assertTrue(tasks.size() == 1)
 
-        def p0 = result.v2[0]
-        assertEquals('nested/nested.html', p0.meta.targetPath)
-        assertEquals('<p><strong>Hello, World!</strong></p>\n', p0.content)
+        def t0 = tasks.findAllByType(TextToHtmlFileTask)[0]
+        assertEquals('nested/nested.html', t0.output.htmlPath)
+        def contentResult = t0.output.getContent(
+                tasks,
+                new TaskTypeContainer([TextToHtmlFileTask])
+        ) { Collection<Diagnostic> diagnostics ->
+            fail(getDiagnosticsMessageSupplier(diagnostics))
+        }
+        assertEquals('<p><strong>Hello, World!</strong></p>\n', contentResult)
     }
 
     @Test
@@ -105,15 +121,28 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         def result = this.ssg.generate(this.build)
 
         assertEmptyDiagnostics(result)
-        assertEquals(2, result.v2.size())
+        def tasks = result.get()
+        assertEquals(2, tasks.size())
 
-        def testPage = result.v2.find { it.meta.targetPath == 'test.html' }
-        assertNotNull(testPage)
-        assertEquals('2', testPage.content)
+        def taskTypes = new TaskTypeContainer([TextToHtmlFileTask, SpecialPageToHtmlFileTask])
 
-        def specialPage = result.v2.find { it.meta.targetPath == 'special.html' }
-        assertNotNull(specialPage)
-        assertEquals('<p>Hello, World!</p>\n', specialPage.content)
+        def testPageTask = tasks.findAllByType(TextToHtmlFileTask).find {
+            it.output.htmlPath == 'test.html'
+        }
+        assertNotNull(testPageTask)
+        def testPageContent = testPageTask.output.getContent(tasks, taskTypes) { Collection<Diagnostic> diagnostics ->
+            fail(getDiagnosticsMessageSupplier(diagnostics))
+        }
+        assertEquals('2', testPageContent)
+
+        def specialPageTask = tasks.findAllByType(SpecialPageToHtmlFileTask).find {
+            it.output.htmlPath == 'special.html'
+        }
+        assertNotNull(specialPageTask)
+        def specialPageContent = specialPageTask.output.getContent(tasks, taskTypes) { Collection<Diagnostic> diagnostics ->
+            fail(getDiagnosticsMessageSupplier(diagnostics))
+        }
+        assertEquals('<p>Hello, World!</p>\n', specialPageContent)
     }
 
     @Test
@@ -121,7 +150,7 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         new File(this.textsDir, 'test.md').write('Hello, World!')
         def result = this.ssg.generate(this.build)
         assertEmptyDiagnostics(result)
-        assertEquals(0, result.v2.size())
+        assertEquals(0, result.get().size())
     }
 
 }
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/text/ExcerptGetterTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/text/ExcerptGetterTests.groovy
index 7f8abc1..fe4ec29 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/text/ExcerptGetterTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/text/ExcerptGetterTests.groovy
@@ -2,6 +2,7 @@ package com.jessebrault.ssg.text
 
 import org.junit.jupiter.api.Test
 
+import static com.jessebrault.ssg.text.TextMocks.renderableText
 import static org.junit.jupiter.api.Assertions.assertEquals
 
 class ExcerptGetterTests {
@@ -10,7 +11,7 @@ class ExcerptGetterTests {
 
     @Test
     void takesAllIfTextLessThanLimit() {
-        def text = new Text('One Two Three Four Five', null, null)
+        def text = renderableText('One Two Three Four Five')
         def result = this.excerptGetter.getExcerpt(text, 10)
         assertEquals(0, result.v1.size())
         assertEquals('One Two Three Four Five', result.v2)
@@ -18,7 +19,7 @@ class ExcerptGetterTests {
 
     @Test
     void takesTheLimit() {
-        def text = new Text('One Two Three Four Five', null, null)
+        def text = renderableText('One Two Three Four Five')
         def result = this.excerptGetter.getExcerpt(text, 2)
         assertEquals(0, result.v1.size())
         assertEquals('One Two', result.v2)
@@ -26,7 +27,7 @@ class ExcerptGetterTests {
 
     @Test
     void worksWithHeading() {
-        def text = new Text('# Heading\nOne Two Three', null, null)
+        def text = renderableText('# Heading\nOne Two Three')
         def result = this.excerptGetter.getExcerpt(text, 1)
         assertEquals(0, result.v1.size())
         assertEquals('Heading', result.v2)
@@ -34,7 +35,7 @@ class ExcerptGetterTests {
 
     @Test
     void worksWithFrontMatter() {
-        def text = new Text('---\ntest: hello\n---\nOne Two Three', null, null)
+        def text = renderableText('---\ntest: hello\n---\nOne Two Three')
         def result = this.excerptGetter.getExcerpt(text, 1)
         assertEquals(0, result.v1.size())
         assertEquals('One', result.v2)
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
index 9d2019a..8b17690 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
@@ -8,6 +8,10 @@ import com.jessebrault.ssg.part.PartRenderer
 import com.jessebrault.ssg.part.PartType
 import com.jessebrault.ssg.renderer.RenderContext
 import com.jessebrault.ssg.tagbuilder.TagBuilder
+import com.jessebrault.ssg.task.HtmlFileOutput
+import com.jessebrault.ssg.task.TaskContainer
+import com.jessebrault.ssg.task.TaskTypeContainer
+import com.jessebrault.ssg.task.TextToHtmlFileTask
 import com.jessebrault.ssg.text.EmbeddableTextsCollection
 import com.jessebrault.ssg.url.UrlBuilder
 import org.junit.jupiter.api.Test
@@ -18,8 +22,11 @@ import org.mockito.junit.jupiter.MockitoExtension
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+import static com.jessebrault.ssg.task.SpecialPageToHtmlFileTaskMocks.blankSpecialPageToHtmlFileTask
+import static com.jessebrault.ssg.task.TextToHtmlFileTaskMocks.blankTextToHtmlFileTask
 import static com.jessebrault.ssg.testutil.DiagnosticsUtil.assertEmptyDiagnostics
 import static com.jessebrault.ssg.testutil.RenderContextUtil.getRenderContext
+import static com.jessebrault.ssg.text.TextMocks.blankText
 import static com.jessebrault.ssg.text.TextMocks.renderableTextWithPath
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.fail
@@ -146,6 +153,48 @@ interface StandardDslConsumerTests {
         )
     }
 
+    @Test
+    default void tasksAvailable() {
+        this.doDslAssertionTest("<% assert tasks != null && tasks instanceof ${ TaskContainer.name } %>")
+    }
+
+    @Test
+    default void tasksFind() {
+        def task = new TextToHtmlFileTask(
+                'testTask',
+                blankText(),
+                new HtmlFileOutput(
+                        new File('test.html'),
+                        'test.html',
+                        { '' }
+                )
+        )
+        this.doDslRenderTest(
+                'test.html',
+                '<%= tasks.find { it.name == "testTask" }.output.htmlPath %>',
+                getRenderContext(tasks: new TaskContainer([task]))
+        )
+    }
+
+    @Test
+    default void taskTypesAvailable() {
+        this.doDslAssertionTest(
+                "<% assert taskTypes != null && taskTypes instanceof ${ TaskTypeContainer.name } %>"
+        )
+    }
+
+    @Test
+    default void taskFindAllByType() {
+        def t0 = blankTextToHtmlFileTask()
+        def t1 = blankSpecialPageToHtmlFileTask()
+        this.doDslAssertionTest(
+                '<% assert tasks.size() == 2 && ' +
+                        'tasks.findAllByType(taskTypes.textToHtmlFile).size() == 1 &&' +
+                        'tasks.findAllByType(taskTypes.specialPageToHtmlFile).size() == 1 %>',
+                getRenderContext(tasks: new TaskContainer([t0, t1]))
+        )
+    }
+
     @Test
     default void textsAvailable() {
         this.doDslAssertionTest(
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/specialpage/SpecialPageMocks.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/specialpage/SpecialPageMocks.groovy
new file mode 100644
index 0000000..8dfdda7
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/specialpage/SpecialPageMocks.groovy
@@ -0,0 +1,16 @@
+package com.jessebrault.ssg.specialpage
+
+import static org.mockito.Mockito.mock
+
+final class SpecialPageMocks {
+
+    static SpecialPage blankSpecialPage() {
+        def renderer = mock(SpecialPageRenderer)
+        new SpecialPage(
+                '',
+                '',
+                new SpecialPageType([], renderer)
+        )
+    }
+
+}
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskMocks.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskMocks.groovy
new file mode 100644
index 0000000..df07cb9
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskMocks.groovy
@@ -0,0 +1,19 @@
+package com.jessebrault.ssg.task
+
+import static com.jessebrault.ssg.specialpage.SpecialPageMocks.blankSpecialPage
+
+final class SpecialPageToHtmlFileTaskMocks {
+
+    static SpecialPageToHtmlFileTask blankSpecialPageToHtmlFileTask() {
+        new SpecialPageToHtmlFileTask(
+                '',
+                blankSpecialPage(),
+                new HtmlFileOutput(
+                        new File(''),
+                        '',
+                        { '' }
+                )
+        )
+    }
+
+}
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskMocks.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskMocks.groovy
new file mode 100644
index 0000000..2a13a01
--- /dev/null
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskMocks.groovy
@@ -0,0 +1,19 @@
+package com.jessebrault.ssg.task
+
+import static com.jessebrault.ssg.text.TextMocks.blankText
+
+final class TextToHtmlFileTaskMocks {
+
+    static TextToHtmlFileTask blankTextToHtmlFileTask() {
+        new TextToHtmlFileTask(
+                '',
+                blankText(),
+                new HtmlFileOutput(
+                        new File(''),
+                        '',
+                        { '' }
+                )
+        )
+    }
+
+}
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
index 77a3be3..7f51645 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/DiagnosticsUtil.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg.testutil
 
 import com.jessebrault.ssg.Diagnostic
+import com.jessebrault.ssg.Result
 import com.jessebrault.ssg.text.ExcerptGetter
 import groovy.transform.stc.ClosureParams
 import groovy.transform.stc.FirstParam
@@ -25,6 +26,10 @@ class DiagnosticsUtil {
         assertTrue(result.v1.isEmpty(), getDiagnosticsMessageSupplier(result.v1))
     }
 
+    static void assertEmptyDiagnostics(Result<?> result) {
+        assertTrue(!result.hasDiagnostics(), getDiagnosticsMessageSupplier(result.diagnostics))
+    }
+
     static <E extends Exception> void assertDiagnosticException(
             Class<E> expectedException,
             Diagnostic diagnostic,
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
index a306b14..191895e 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
@@ -3,6 +3,8 @@ package com.jessebrault.ssg.testutil
 import com.jessebrault.ssg.Config
 import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.task.Task
+import com.jessebrault.ssg.task.TaskContainer
 
 class RenderContextUtil {
 
@@ -14,7 +16,9 @@ class RenderContextUtil {
                 args?.texts as Collection ?: [],
                 args?.parts as Collection ?: [],
                 args?.sourcePath as String ?: '',
-                args?.targetPath as String ?: ''
+                args?.targetPath as String ?: '',
+                args?.tasks as TaskContainer ?: new TaskContainer(),
+                args?.taskTypes as Set<Class<? extends Task>> ?: [] as Set<Class<? extends Task>>
         )
     }
 
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
index fe9e566..ee8a81c 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/text/TextMocks.groovy
@@ -18,7 +18,7 @@ class TextMocks {
         when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
         def frontMatterGetter = mock(FrontMatterGetter)
         def excerptGetter = mock(ExcerptGetter)
-        new Text('', '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+        new Text(text, '', new TextType([], textRenderer, frontMatterGetter, excerptGetter))
     }
 
     static Text textWithPath(String path) {
@@ -33,7 +33,7 @@ class TextMocks {
         when(textRenderer.render(any(), any())).thenReturn(new Tuple2<>([], text))
         def frontMatterGetter = mock(FrontMatterGetter)
         def excerptGetter = mock(ExcerptGetter)
-        new Text('', path, new TextType([], textRenderer, frontMatterGetter, excerptGetter))
+        new Text(text, path, new TextType([], textRenderer, frontMatterGetter, excerptGetter))
     }
 
 }

From acd59b4e3d61738ae7283d115b4e7da93fa27707 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:33:44 +0100
Subject: [PATCH 33/36] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aa3adf..e717505 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
+- Templates, SpecialPages, and Parts all have access to two related objects: `tasks` and `taskTypes`. The first is an instance of [`TaskContainer`](lib/src/main/groovy/com/jessebrault/ssg/task/TaskContainer.groovy) and can be used to access all of the [`Task`](lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy) instances for a given build. The second is in an instance of [`TaskTypeContainer`](lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy) and can be used to access the various [`TaskType`](lib/src/main/groovy/com/jessebrault/ssg/task/TaskType.groovy) instances for a given build. For example, one could use these together to obtain the output path of an html file from another task (assume one is in a `.gsp` file):
+    ```groovy
+    def otherTask = tasks.findAllByType(taskTypes.textToHtmlFile).find { it.input.path == 'someText.md' }
+    assert otherTask.output.htmlPath == 'someText.html'
+    ```
+  This is a complicated and experimental feature and may be changed frequently depending on future developments. [92c8108](https://github.com/JesseBrault0709/ssg/commit/92c8108).
 - Templates, SpecialPages, and Parts all have access to a `logger` of type `org.slf4j.Logger`. [64f342a](https://github.com/JesseBrault0709/ssg/commit/64f342a).
 - There is now the notion of a `siteSpec`, an object of type of [`SiteSpec`](lib/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy). It is simmilar to the `globals` object in that it contains properties that are available in all Templates, SpecialPages, and Parts. Unlike `globals`, which contains user-defined keys, `siteSpec` contains (for now) the pre-defined keys `baseUrl` and `title`. To configure the `siteSpec`, add the following block to a `build` block in `ssgBuilds.groovy`:
     ```groovy

From ee98482e7e288fdff9a71889921097116f04ae55 Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Tue, 21 Feb 2023 18:41:33 +0100
Subject: [PATCH 34/36] Fixed null pointer bug with taskTypes.

---
 .../ssg/AbstractBuildCommand.groovy           |  2 +-
 .../ssg/SimpleStaticSiteGenerator.groovy      | 15 ++++++--
 .../ssg/StaticSiteGenerator.groovy            |  2 +
 .../ssg/renderer/RenderContext.groovy         |  4 +-
 .../ssg/task/SpecialPageToHtmlFileTask.groovy |  4 +-
 .../SpecialPageToHtmlFileTaskFactory.groovy   |  5 +++
 .../jessebrault/ssg/task/TaskFactory.groovy   |  1 +
 .../ssg/task/TaskTypeContainer.groovy         | 37 ++++++++-----------
 .../ssg/task/TextToHtmlFileTask.groovy        |  4 +-
 .../ssg/task/TextToHtmlFileTaskFactory.groovy |  5 +++
 .../ssg/testutil/RenderContextUtil.groovy     |  3 +-
 11 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
index d56c0cc..cd483a7 100644
--- a/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
+++ b/cli/src/main/groovy/com/jessebrault/ssg/AbstractBuildCommand.groovy
@@ -92,7 +92,7 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
                 def context = new TaskExecutorContext(
                         it,
                         tasks,
-                        null,
+                        this.ssg.taskTypes,
                         { Collection<Diagnostic> diagnostics ->
                             executionDiagnostics.addAll(diagnostics)
                         }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
index ca0583b..0219f67 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/SimpleStaticSiteGenerator.groovy
@@ -2,6 +2,7 @@ package com.jessebrault.ssg
 
 import com.jessebrault.ssg.task.SpecialPageToHtmlFileTaskFactory
 import com.jessebrault.ssg.task.TaskContainer
+import com.jessebrault.ssg.task.TaskTypeContainer
 import com.jessebrault.ssg.task.TextToHtmlFileTaskFactory
 import groovy.transform.NullCheck
 import org.slf4j.Logger
@@ -16,6 +17,14 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
     private static final Marker enter = MarkerFactory.getMarker('ENTER')
     private static final Marker exit = MarkerFactory.getMarker('EXIT')
 
+    private static final TextToHtmlFileTaskFactory textHtmlFactory = new TextToHtmlFileTaskFactory()
+    private static final SpecialPageToHtmlFileTaskFactory specialPageHtmlFactory = new SpecialPageToHtmlFileTaskFactory()
+
+    @Override
+    TaskTypeContainer getTaskTypes() {
+        new TaskTypeContainer([textHtmlFactory.taskType, specialPageHtmlFactory.taskType])
+    }
+
     @Override
     Result<TaskContainer> generate(Build build) {
         logger.trace(enter, 'build: {}', build)
@@ -24,13 +33,11 @@ class SimpleStaticSiteGenerator implements StaticSiteGenerator {
         def tasks = new TaskContainer()
         def diagnostics = []
 
-        def textToHtmlFactory = new TextToHtmlFileTaskFactory()
-        def textsResult = textToHtmlFactory.getTasks(build)
+        def textsResult = textHtmlFactory.getTasks(build)
         tasks.addAll(textsResult.get())
         diagnostics.addAll(textsResult.diagnostics)
 
-        def specialPageToHtmlFactory = new SpecialPageToHtmlFileTaskFactory()
-        def specialPagesResult = specialPageToHtmlFactory.getTasks(build)
+        def specialPagesResult = specialPageHtmlFactory.getTasks(build)
         tasks.addAll(specialPagesResult.get())
         diagnostics.addAll(specialPagesResult.diagnostics)
 
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
index b6e2844..fe72287 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
@@ -1,7 +1,9 @@
 package com.jessebrault.ssg
 
 import com.jessebrault.ssg.task.TaskContainer
+import com.jessebrault.ssg.task.TaskTypeContainer
 
 interface StaticSiteGenerator {
+    TaskTypeContainer getTaskTypes()
     Result<TaskContainer> generate(Build build)
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy b/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
index fcc763a..5a4171a 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/renderer/RenderContext.groovy
@@ -3,8 +3,8 @@ package com.jessebrault.ssg.renderer
 import com.jessebrault.ssg.Config
 import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.part.Part
-import com.jessebrault.ssg.task.Task
 import com.jessebrault.ssg.task.TaskContainer
+import com.jessebrault.ssg.task.TaskTypeContainer
 import com.jessebrault.ssg.text.Text
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.NullCheck
@@ -22,5 +22,5 @@ final class RenderContext {
     final String sourcePath
     final String targetPath
     final TaskContainer tasks
-    final Set<Class<? extends Task>> taskTypes
+    final TaskTypeContainer taskTypes
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
index 4ae3749..22beae8 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
@@ -24,7 +24,7 @@ final class SpecialPageToHtmlFileTask extends AbstractTask<SpecialPageToHtmlFile
 
     }
 
-    private static final TaskType<SpecialPageToHtmlFileTask> type = new TaskType<>(
+    static final TaskType<SpecialPageToHtmlFileTask> TYPE = new TaskType<>(
             'specialPageToHtmlFile', new SpecialPageToHtmlFileTaskExecutor()
     )
 
@@ -32,7 +32,7 @@ final class SpecialPageToHtmlFileTask extends AbstractTask<SpecialPageToHtmlFile
     final HtmlFileOutput output
 
     SpecialPageToHtmlFileTask(String name, SpecialPage input, HtmlFileOutput output) {
-        super(type, name)
+        super(TYPE, name)
         this.input = input
         this.output = output
     }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy
index a59878b..45017e5 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTaskFactory.groovy
@@ -15,6 +15,11 @@ final class SpecialPageToHtmlFileTaskFactory implements TaskFactory<SpecialPageT
     private static final Marker enter = MarkerFactory.getMarker('ENTER')
     private static final Marker exit = MarkerFactory.getMarker('EXIT')
 
+    @Override
+    TaskType<SpecialPageToHtmlFileTask> getTaskType() {
+        SpecialPageToHtmlFileTask.TYPE
+    }
+
     @Override
     Result<TaskCollection<SpecialPageToHtmlFileTask>> getTasks(Build build) {
         logger.trace(enter, 'build: {}', build)
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
index b538653..60b78ff 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskFactory.groovy
@@ -4,5 +4,6 @@ import com.jessebrault.ssg.Build
 import com.jessebrault.ssg.Result
 
 interface TaskFactory<T extends Task> {
+    TaskType<T> getTaskType()
     Result<TaskCollection<T>> getTasks(Build build)
 }
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy
index cb1365d..b4092cc 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskTypeContainer.groovy
@@ -1,36 +1,31 @@
 package com.jessebrault.ssg.task
 
-import java.util.regex.Pattern
-
 final class TaskTypeContainer {
 
-    private static final Pattern taskTypeNamePattern = ~/(.*)Task/
-
     @Delegate
-    private final Set<Class<? extends Task>> taskTypes = []
+    private final Set<TaskType<? extends Task>> taskTypes = []
 
-    TaskTypeContainer(Collection<Class<? extends Task>> taskTypes = null) {
-        if (taskTypes) {
+    TaskTypeContainer(Collection<TaskType<? extends Task>> taskTypes) {
+        if (taskTypes != null) {
             this.taskTypes.addAll(taskTypes)
         }
     }
 
+    TaskTypeContainer(TaskTypeContainer taskTypeContainer) {
+        if (taskTypeContainer != null) {
+            this.taskTypes.addAll(taskTypeContainer)
+        }
+    }
+
+    TaskTypeContainer() {}
+
     @Override
-    Class<? extends Task> getProperty(String propertyName) {
-        def result = this.taskTypes.find {
-            def m = taskTypeNamePattern.matcher(it.simpleName)
-            if (m.matches()) {
-                def withoutTaskEnd = m.group(1)
-                def uncapitalized = withoutTaskEnd.uncapitalize()
-                return propertyName == uncapitalized
-            } else {
-                throw new IllegalStateException("invalid task type name: ${ it.simpleName }")
-            }
+    TaskType<? extends Task> getProperty(String propertyName) {
+        def taskType = this.taskTypes.find { it.name == propertyName }
+        if (!taskType) {
+            throw new IllegalArgumentException("no such taskType: ${ propertyName }")
         }
-        if (!result) {
-            throw new IllegalStateException("no such taskType: ${ propertyName }")
-        }
-        result
+        taskType
     }
 
 }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
index 42883f0..dae969c 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
@@ -24,7 +24,7 @@ final class TextToHtmlFileTask extends AbstractTask<TextToHtmlFileTask> {
 
     }
 
-    private static final TaskType<TextToHtmlFileTask> type = new TaskType<>(
+    static final TaskType<TextToHtmlFileTask> TYPE = new TaskType<>(
             'textToHtmlFile', new TextToHtmlFileTaskExecutor()
     )
 
@@ -32,7 +32,7 @@ final class TextToHtmlFileTask extends AbstractTask<TextToHtmlFileTask> {
     final HtmlFileOutput output
 
     TextToHtmlFileTask(String name, Text input, HtmlFileOutput output) {
-        super(type, name)
+        super(TYPE, name)
         this.input = input
         this.output = output
     }
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy
index bfe3298..0f8d1c0 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTaskFactory.groovy
@@ -17,6 +17,11 @@ final class TextToHtmlFileTaskFactory implements TaskFactory<TextToHtmlFileTask>
     private static final Marker enter = MarkerFactory.getMarker('ENTER')
     private static final Marker exit = MarkerFactory.getMarker('EXIT')
 
+    @Override
+    TaskType<TextToHtmlFileTask> getTaskType() {
+        TextToHtmlFileTask.TYPE
+    }
+
     @Override
     Result<TaskCollection<TextToHtmlFileTask>> getTasks(Build build) {
         logger.trace(enter, 'build: {}', build)
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
index 191895e..2477d6e 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/testutil/RenderContextUtil.groovy
@@ -5,6 +5,7 @@ import com.jessebrault.ssg.SiteSpec
 import com.jessebrault.ssg.renderer.RenderContext
 import com.jessebrault.ssg.task.Task
 import com.jessebrault.ssg.task.TaskContainer
+import com.jessebrault.ssg.task.TaskTypeContainer
 
 class RenderContextUtil {
 
@@ -18,7 +19,7 @@ class RenderContextUtil {
                 args?.sourcePath as String ?: '',
                 args?.targetPath as String ?: '',
                 args?.tasks as TaskContainer ?: new TaskContainer(),
-                args?.taskTypes as Set<Class<? extends Task>> ?: [] as Set<Class<? extends Task>>
+                args?.taskTypes as TaskTypeContainer ?: new TaskTypeContainer()
         )
     }
 

From 6cd1a68644b4713944fcb33595ffdf165480588b Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Tue, 21 Feb 2023 19:08:09 +0100
Subject: [PATCH 35/36] Fixing more task-related bugs.

---
 .../jessebrault/ssg/dsl/StandardDslMap.groovy |  3 +++
 .../com/jessebrault/ssg/task/Task.groovy      |  1 +
 .../ssg/task/TaskCollection.groovy            |  4 ++--
 ...StaticSiteGeneratorIntegrationTests.groovy | 14 ++++++-------
 .../ssg/dsl/StandardDslConsumerTests.groovy   | 21 ++++++++++++++-----
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy b/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
index 2443030..c57760e 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
@@ -2,6 +2,7 @@ package com.jessebrault.ssg.dsl
 
 import com.jessebrault.ssg.part.EmbeddablePartsMap
 import com.jessebrault.ssg.renderer.RenderContext
+import com.jessebrault.ssg.tagbuilder.DynamicTagBuilder
 import com.jessebrault.ssg.text.EmbeddableText
 import com.jessebrault.ssg.text.EmbeddableTextsCollection
 import com.jessebrault.ssg.text.Text
@@ -57,8 +58,10 @@ final class StandardDslMap {
             )
             it.siteSpec = context.siteSpec
             it.sourcePath = context.sourcePath
+            it.tagBuilder = new DynamicTagBuilder()
             it.targetPath = context.targetPath
             it.tasks = context.tasks
+            it.taskTypes = context.taskTypes
             it.text = b.text ? new EmbeddableText(
                     b.text,
                     context.globals,
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
index 6ee1e7b..47217d2 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/Task.groovy
@@ -1,6 +1,7 @@
 package com.jessebrault.ssg.task
 
 interface Task {
+    TaskType<? extends Task> getType()
     String getName()
     void execute(TaskExecutorContext context)
 }
\ No newline at end of file
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy
index 856fd2c..50a3f37 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TaskCollection.groovy
@@ -14,10 +14,10 @@ class TaskCollection<T extends Task> {
     }
 
     def <U extends T> TaskCollection<U> findAllByType(
-            Class<U> taskClass
+            TaskType<U> taskType
     ) {
         new TaskCollection<>(this.tasks.findResults {
-            taskClass.isAssignableFrom(it.class) ? taskClass.cast(it) : null
+            it.type == taskType ? it : null
         })
     }
 
diff --git a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
index 1fc7159..bc6416c 100644
--- a/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
+++ b/lib/src/test/groovy/com/jessebrault/ssg/SimpleStaticSiteGeneratorIntegrationTests.groovy
@@ -76,9 +76,9 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         def tasks = result.get()
         assertTrue(tasks.size() == 1)
 
-        def t0 = tasks.findAllByType(TextToHtmlFileTask)[0]
+        def t0 = tasks.findAllByType(TextToHtmlFileTask.TYPE)[0]
         assertEquals('test.html', t0.output.htmlPath)
-        def contentResult = t0.output.getContent(tasks, new TaskTypeContainer([TextToHtmlFileTask])) { Collection<Diagnostic> diagnostics ->
+        def contentResult = t0.output.getContent(tasks, new TaskTypeContainer([TextToHtmlFileTask.TYPE])) { Collection<Diagnostic> diagnostics ->
             fail(getDiagnosticsMessageSupplier(diagnostics))
         }
         assertEquals('<p><strong>Hello, World!</strong></p>\n', contentResult)
@@ -100,11 +100,11 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         def tasks = result.get()
         assertTrue(tasks.size() == 1)
 
-        def t0 = tasks.findAllByType(TextToHtmlFileTask)[0]
+        def t0 = tasks.findAllByType(TextToHtmlFileTask.TYPE)[0]
         assertEquals('nested/nested.html', t0.output.htmlPath)
         def contentResult = t0.output.getContent(
                 tasks,
-                new TaskTypeContainer([TextToHtmlFileTask])
+                new TaskTypeContainer([TextToHtmlFileTask.TYPE])
         ) { Collection<Diagnostic> diagnostics ->
             fail(getDiagnosticsMessageSupplier(diagnostics))
         }
@@ -124,9 +124,9 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         def tasks = result.get()
         assertEquals(2, tasks.size())
 
-        def taskTypes = new TaskTypeContainer([TextToHtmlFileTask, SpecialPageToHtmlFileTask])
+        def taskTypes = new TaskTypeContainer([TextToHtmlFileTask.TYPE, SpecialPageToHtmlFileTask.TYPE])
 
-        def testPageTask = tasks.findAllByType(TextToHtmlFileTask).find {
+        def testPageTask = tasks.findAllByType(TextToHtmlFileTask.TYPE).find {
             it.output.htmlPath == 'test.html'
         }
         assertNotNull(testPageTask)
@@ -135,7 +135,7 @@ class SimpleStaticSiteGeneratorIntegrationTests {
         }
         assertEquals('2', testPageContent)
 
-        def specialPageTask = tasks.findAllByType(SpecialPageToHtmlFileTask).find {
+        def specialPageTask = tasks.findAllByType(SpecialPageToHtmlFileTask.TYPE).find {
             it.output.htmlPath == 'special.html'
         }
         assertNotNull(specialPageTask)
diff --git a/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
index 8b17690..715bbab 100644
--- a/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
+++ b/lib/src/testFixtures/groovy/com/jessebrault/ssg/dsl/StandardDslConsumerTests.groovy
@@ -9,11 +9,14 @@ import com.jessebrault.ssg.part.PartType
 import com.jessebrault.ssg.renderer.RenderContext
 import com.jessebrault.ssg.tagbuilder.TagBuilder
 import com.jessebrault.ssg.task.HtmlFileOutput
+import com.jessebrault.ssg.task.SpecialPageToHtmlFileTask
 import com.jessebrault.ssg.task.TaskContainer
 import com.jessebrault.ssg.task.TaskTypeContainer
 import com.jessebrault.ssg.task.TextToHtmlFileTask
+import com.jessebrault.ssg.task.TextToHtmlFileTaskFactory
 import com.jessebrault.ssg.text.EmbeddableTextsCollection
 import com.jessebrault.ssg.url.UrlBuilder
+import net.bytebuddy.implementation.bytecode.Throw
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
@@ -49,11 +52,13 @@ interface StandardDslConsumerTests {
     }
 
     default void doDslAssertionTest(String scriptlet, RenderContext context = null) {
+        Tuple2<Collection<Diagnostic>, String> result = null
         try {
-            this.render(scriptlet, context ?: getRenderContext())
-        } catch (AssertionError e) {
+            result = this.render(scriptlet, context ?: getRenderContext())
+        } catch (Throwable e) {
             fail(e)
         }
+        assertEmptyDiagnostics(result)
     }
 
     @Test
@@ -133,7 +138,7 @@ interface StandardDslConsumerTests {
 
     @Test
     default void tagBuilderAvailable() {
-        this.doDslAssertionTest("<% assert tagBuider && tagBuilder instanceof ${ TagBuilder.name } %>")
+        this.doDslAssertionTest("<% assert tagBuilder && tagBuilder instanceof ${ TagBuilder.name } %>")
     }
 
     @Test
@@ -172,7 +177,10 @@ interface StandardDslConsumerTests {
         this.doDslRenderTest(
                 'test.html',
                 '<%= tasks.find { it.name == "testTask" }.output.htmlPath %>',
-                getRenderContext(tasks: new TaskContainer([task]))
+                getRenderContext(
+                        tasks: new TaskContainer([task]),
+                        taskTypes: new TaskTypeContainer([TextToHtmlFileTask.TYPE])
+                )
         )
     }
 
@@ -191,7 +199,10 @@ interface StandardDslConsumerTests {
                 '<% assert tasks.size() == 2 && ' +
                         'tasks.findAllByType(taskTypes.textToHtmlFile).size() == 1 &&' +
                         'tasks.findAllByType(taskTypes.specialPageToHtmlFile).size() == 1 %>',
-                getRenderContext(tasks: new TaskContainer([t0, t1]))
+                getRenderContext(
+                        tasks: new TaskContainer([t0, t1]),
+                        taskTypes: new TaskTypeContainer([TextToHtmlFileTask.TYPE, SpecialPageToHtmlFileTask.TYPE])
+                )
         )
     }
 

From ff6c1b207fcb0a120f7ab85ee869878855e7aeed Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Wed, 1 Mar 2023 09:57:25 -0500
Subject: [PATCH 36/36] Fixed output parent directories bug.

---
 .../com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy    | 1 +
 .../groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
index 22beae8..fc4eed6 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/SpecialPageToHtmlFileTask.groovy
@@ -12,6 +12,7 @@ final class SpecialPageToHtmlFileTask extends AbstractTask<SpecialPageToHtmlFile
 
         @Override
         void execute(SpecialPageToHtmlFileTask task, TaskExecutorContext context) {
+            task.output.file.createParentDirectories()
             task.output.file.write(task.output.getContent(
                     context.allTasks, context.allTypes, context.onDiagnostics
             ))
diff --git a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
index dae969c..f89a063 100644
--- a/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
+++ b/lib/src/main/groovy/com/jessebrault/ssg/task/TextToHtmlFileTask.groovy
@@ -12,6 +12,7 @@ final class TextToHtmlFileTask extends AbstractTask<TextToHtmlFileTask> {
 
         @Override
         void execute(TextToHtmlFileTask task, TaskExecutorContext context) {
+            task.output.file.createParentDirectories()
             task.output.file.write(task.output.getContent(
                     context.allTasks, context.allTypes, context.onDiagnostics
             ))