From bee1dead984f3cd7494754c5ad0ace17e04ae365 Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Mon, 23 Jan 2023 13:21:25 +0100 Subject: [PATCH] Renaming to gcp. --- ...GspeTemplate.groovy => GcpTemplate.groovy} | 2 +- ...Engine.groovy => GcpTemplateEngine.groovy} | 8 ++-- ...s.groovy => GcpTemplateEngineTests.groovy} | 43 +++++++++---------- 3 files changed, 26 insertions(+), 27 deletions(-) rename gcp/src/main/groovy/com/jessebrault/gcp/{GspeTemplate.groovy => GcpTemplate.groovy} (95%) rename gcp/src/main/groovy/com/jessebrault/gcp/{GspeTemplateEngine.groovy => GcpTemplateEngine.groovy} (91%) rename gcp/src/test/groovy/com/jessebrault/gcp/{GspeTemplateEngineTests.groovy => GcpTemplateEngineTests.groovy} (70%) diff --git a/gcp/src/main/groovy/com/jessebrault/gcp/GspeTemplate.groovy b/gcp/src/main/groovy/com/jessebrault/gcp/GcpTemplate.groovy similarity index 95% rename from gcp/src/main/groovy/com/jessebrault/gcp/GspeTemplate.groovy rename to gcp/src/main/groovy/com/jessebrault/gcp/GcpTemplate.groovy index 28ec3ec..ba72ffa 100644 --- a/gcp/src/main/groovy/com/jessebrault/gcp/GspeTemplate.groovy +++ b/gcp/src/main/groovy/com/jessebrault/gcp/GcpTemplate.groovy @@ -3,7 +3,7 @@ package com.jessebrault.gcp import com.jessebrault.gcp.component.ComponentsContainer import groovy.text.Template -class GspeTemplate implements Template { +class GcpTemplate implements Template { Closure templateClosure ComponentsContainer components diff --git a/gcp/src/main/groovy/com/jessebrault/gcp/GspeTemplateEngine.groovy b/gcp/src/main/groovy/com/jessebrault/gcp/GcpTemplateEngine.groovy similarity index 91% rename from gcp/src/main/groovy/com/jessebrault/gcp/GspeTemplateEngine.groovy rename to gcp/src/main/groovy/com/jessebrault/gcp/GcpTemplateEngine.groovy index 5c6342f..be53216 100644 --- a/gcp/src/main/groovy/com/jessebrault/gcp/GspeTemplateEngine.groovy +++ b/gcp/src/main/groovy/com/jessebrault/gcp/GcpTemplateEngine.groovy @@ -12,13 +12,13 @@ import org.slf4j.LoggerFactory import java.util.concurrent.atomic.AtomicInteger import java.util.function.Supplier -final class GspeTemplateEngine extends TemplateEngine { +final class GcpTemplateEngine extends TemplateEngine { - private static final Logger logger = LoggerFactory.getLogger(GspeTemplateEngine) + private static final Logger logger = LoggerFactory.getLogger(GcpTemplateEngine) @TupleConstructor(defaults = false) static class Configuration { - Supplier ssgTemplateSupplier + Supplier ssgTemplateSupplier Collection componentDirUrls Collection components } @@ -28,7 +28,7 @@ final class GspeTemplateEngine extends TemplateEngine { private final AtomicInteger templateCount = new AtomicInteger(0) private final GroovyScriptEngine scriptEngine - GspeTemplateEngine(Configuration configuration) { + GcpTemplateEngine(Configuration configuration) { this.configuration = configuration this.scriptEngine = new GroovyScriptEngine([this.scriptsDir.toURI().toURL()] as URL[]) } diff --git a/gcp/src/test/groovy/com/jessebrault/gcp/GspeTemplateEngineTests.groovy b/gcp/src/test/groovy/com/jessebrault/gcp/GcpTemplateEngineTests.groovy similarity index 70% rename from gcp/src/test/groovy/com/jessebrault/gcp/GspeTemplateEngineTests.groovy rename to gcp/src/test/groovy/com/jessebrault/gcp/GcpTemplateEngineTests.groovy index 467bb91..eb0f3c0 100644 --- a/gcp/src/test/groovy/com/jessebrault/gcp/GspeTemplateEngineTests.groovy +++ b/gcp/src/test/groovy/com/jessebrault/gcp/GcpTemplateEngineTests.groovy @@ -1,17 +1,16 @@ package com.jessebrault.gcp -import com.jessebrault.gcp.GspeTemplate -import com.jessebrault.gcp.GspeTemplateEngine + import com.jessebrault.gcp.component.Component import groovy.text.TemplateEngine import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.assertEquals -class GspeTemplateEngineTests { +class GcpTemplateEngineTests { - private final TemplateEngine engine = new GspeTemplateEngine(new GspeTemplateEngine.Configuration( - { new GspeTemplate() }, + private final TemplateEngine engine = new GcpTemplateEngine(new GcpTemplateEngine.Configuration( + { new GcpTemplate() }, [], [] )) @@ -65,7 +64,7 @@ class GspeTemplateEngineTests { assertEquals('Hello, World!', r) } - static class CustomBaseTemplate extends GspeTemplate { + static class CustomBaseTemplate extends GcpTemplate { def greeting = 'Greetings!' def name = 'Jesse' @@ -80,8 +79,8 @@ class GspeTemplateEngineTests { @Test void baseTemplateMethodsPresent() { def src = '<%= greet() %>' - def configuration = new GspeTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], []) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], []) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make().toString() assertEquals('Hello, World!', r) } @@ -89,8 +88,8 @@ class GspeTemplateEngineTests { @Test void baseTemplatePropertiesPresent() { def src = '<%= this.greeting %>' - def configuration = new GspeTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], []) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], []) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make().toString() assertEquals('Greetings!', r) } @@ -98,8 +97,8 @@ class GspeTemplateEngineTests { @Test void bindingOverridesCustomBaseTemplate() { def src = '<%= greet() %>' - def configuration = new GspeTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], []) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], []) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make([greet: { "Hello, Person!" }]).toString() assertEquals('Hello, Person!', r) } @@ -116,8 +115,8 @@ class GspeTemplateEngineTests { @Test void selfClosingComponent() { def src = '' - def configuration = new GspeTemplateEngine.Configuration({ new GspeTemplate() }, [], [new Greeter()]) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new GcpTemplate() }, [], [new Greeter()]) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make().toString() assertEquals('Hello, World!', r) } @@ -125,8 +124,8 @@ class GspeTemplateEngineTests { @Test void componentWithGStringAttrValue() { def src = '' - def configuration = new GspeTemplateEngine.Configuration({ new GspeTemplate() }, [], [new Greeter()]) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new GcpTemplate() }, [], [new Greeter()]) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make().toString() assertEquals('Hello, person number 13!', r) } @@ -134,8 +133,8 @@ class GspeTemplateEngineTests { @Test void componentWithGStringAttrValueCanAccessBinding() { def src = '' - def configuration = new GspeTemplateEngine.Configuration({ new GspeTemplate() }, [], [new Greeter()]) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new GcpTemplate() }, [], [new Greeter()]) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make([name: 'Jesse']).toString() assertEquals('Hello, person named Jesse!', r) } @@ -143,8 +142,8 @@ class GspeTemplateEngineTests { @Test void componentWithGStringAttrValueCanAccessBaseTemplateMethod() { def src = '' - def configuration = new GspeTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], [new Greeter()]) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], [new Greeter()]) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make().toString() assertEquals('Hello, person named Jesse!', r) } @@ -152,8 +151,8 @@ class GspeTemplateEngineTests { @Test void componentWithGStringAttrValueCanAccessBaseTemplateProperty() { def src = '' - def configuration = new GspeTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], [new Greeter()]) - def engine = new GspeTemplateEngine(configuration) + def configuration = new GcpTemplateEngine.Configuration({ new CustomBaseTemplate() }, [], [new Greeter()]) + def engine = new GcpTemplateEngine(configuration) def r = engine.createTemplate(src).make().toString() assertEquals('Hello, person named Jesse!', r) }