Work on the gradle/groovy quickstart, and infrastructure to test the quickstart snippets.

Author: ldaley

ratpack-core/src/main/java/ratpack/func/NoArgAction.java

@@ -47,4 +47,15 @@ static NoArgAction throwException(final Throwable throwable) {
     };
   }
 
+  /**
+   * Converts this action to a runnable.
+   * <p>
+   * Any thrown exceptions will be {@link Exceptions#uncheck(NoArgAction) unchecked}.
+   *
+   * @return a runnable
+   */
+  default Runnable toRunnable() {
+    return () -> Exceptions.uncheck(this);
+  }
+
 }

ratpack-groovy/src/main/java/ratpack/groovy/internal/FullRatpackDslBacking.java

@@ -19,7 +19,7 @@
 import groovy.lang.Closure;
 import ratpack.groovy.Groovy;
 
-class FullRatpackDslBacking implements Groovy.Ratpack {
+public class FullRatpackDslBacking implements Groovy.Ratpack {
 
   Closure<?> bindingsConfigurer;
   Closure<?> handlersConfigurer;
@@ -37,7 +37,7 @@ public void serverConfig(Closure<?> configConfigurer) {
     this.serverConfigConfigurer = configConfigurer;
   }
 
-  RatpackDslClosures getClosures() {
+  public RatpackDslClosures getClosures() {
     return new RatpackDslClosures(serverConfigConfigurer, handlersConfigurer, bindingsConfigurer);
   }
 

ratpack-groovy/src/main/java/ratpack/groovy/internal/RatpackScriptBacking.java

@@ -53,17 +53,6 @@ public static void withBacking(Action<Closure<?>> backing, Runnable runnable) {
     }
   }
 
-  public static Action<Closure<?>> swapBacking(Action<Closure<?>> backing) {
-    LOCK_HOLDER.get().lock();
-    try {
-      Action<Closure<?>> previousBacking = BACKING_HOLDER.get();
-      BACKING_HOLDER.set(backing);
-      return previousBacking;
-    } finally {
-      LOCK_HOLDER.get().unlock();
-    }
-  }
-
   public static void execute(Closure<?> closure) throws Exception {
     LOCK_HOLDER.get().lock();
     try {

ratpack-manual/src/content/chapters/02-quick-start.md

@@ -15,6 +15,8 @@ The Ratpack project provides two Gradle plugins:
 1. [io.ratpack.ratpack-java](http://plugins.gradle.org/plugin/io.ratpack.ratpack-java) - for Ratpack applications implemented in Java
 2. [io.ratpack.ratpack-groovy](http://plugins.gradle.org/plugin/io.ratpack.ratpack-groovy)  - for Ratpack applications implemented in [Groovy](http://groovy-lang.org)
 
+> For a more detailed explanation of the Gradle build support, please see the [dedicated chapter](gradle.html).
+
 ### Using the Gradle Java plugin
 
 Create a `build.gradle` file with the following contents:
@@ -45,7 +47,7 @@ mainClassName = "my.app.Main"
 
 Create the file `src/main/java/my/app/Main.java`, with the following content:
 
-```language-java main
+```language-java hello-world
 package my.app;
 
 import ratpack.server.RatpackServer;
@@ -55,7 +57,7 @@ public class Main {
     RatpackServer.start(server -> server 
       .handlers(chain -> chain
         .get(ctx -> ctx.render("Hello World!"))
-        .get(":name", ctx -> ctx.render("Hello " + ctx.getPathTokens().get("name")))     
+        .get(":name", ctx -> ctx.render("Hello " + ctx.getPathTokens().get("name") + "!"))     
       )
     );
   }
@@ -65,7 +67,8 @@ public class Main {
 You can now start the application either by executing the `run` task with Gradle (i.e. `gradle run` on the command line),
 or by importing the project into your IDE and executing the `my.app.Main` class.
 
-For further information on using Ratpack with Gradle, please the [Gradle chapter](gradle.html).
+The [`handlers()` method](api/ratpack/server/RatpackServerSpec.html#handlers-ratpack.func.Action-) takes a function that receives a [`Chain`](api/ratpack/handling/Chain.html) object.
+The “Handler Chain API” is used to build the response handling strategy.
 
 ### Using the Gradle Groovy plugin
 
@@ -93,30 +96,33 @@ dependencies {
 }
 ```
 
-Create directories `src/ratpack` and `src/main/groovy`.
-
-If desired, run `gradle idea` to generate project files for IntelliJ and open the project.
-
-Create a `src/ratpack/ratpack.groovy` file with the following contents:
+Create the file `src/ratpack/ratpack.groovy`, with the following content:
 
-```language-groovy
+```language-groovy hello-world
 import static ratpack.groovy.Groovy.ratpack
 
 ratpack {
     handlers {
-        get("foo") {
-            render "from the foo handler"
+        get {
+            render "Hello World!"
         }
-        get("bar") {
-            render "from the bar handler"
+        get(":name") {
+            render "Hello $pathTokens.name!"
         }
     }
 }
 ```
 
-Run the project by running `gradle run`, or create a distribution archive by running `gradle distZip`.
+You can now start the application either by executing the `run` task with Gradle (i.e. `gradle run` on the command line),
+or by importing the project into your IDE and executing the [`ratpack.groovy.GroovyRatpackMain`](api/ratpack/groovy/GroovyRatpackMain.html) class.
+
+The [`handlers()` method](api/ratpack/groovy/Groovy.Ratpack.html#handlers-groovy.lang.Closure-) takes a closure that delegates to a [`GroovyChain`](api/ratpack/groovy/handling/GroovyChain.html) object.
+The “Groovy Handler Chain DSL” is used to build the response handling strategy.
+
+Changes to the `ratpack.groovy` file are live during development.
+You can edit the file, and the changes will take effect on the next request.
 
-For further information on using Ratpack with Gradle and Groovy, please the [Gradle](gradle.html) and [Groovy](groovy.html) chapters.
+For further information on using Ratpack with Groovy, please the [Groovy](groovy.html) chapter.
 
 ## Using Lazybones project templates
 

ratpack-manual/src/test/groovy/ratpack/manual/JavadocCodeSnippetTests.groovy

@@ -30,7 +30,7 @@ class JavadocCodeSnippetTests extends CodeSnippetTestCase {
     "java-chain-dsl"    : new JavaChainDslFixture(),
     "groovy-chain-dsl"  : new GroovyChainDslFixture(),
     "groovy-ratpack-dsl": new GroovyRatpackDslFixture(),
-    "java"              : new JavaExampleClassFixture(),
+    "java"              : new JavaClassFixture(),
   ]
 
   @Override

ratpack-manual/src/test/groovy/ratpack/manual/ManualCodeSnippetTests.groovy

@@ -17,21 +17,40 @@
 package ratpack.manual
 
 import com.google.common.base.StandardSystemProperty
+import ratpack.func.NoArgAction
+import ratpack.groovy.Groovy
+import ratpack.groovy.internal.FullRatpackDslBacking
+import ratpack.groovy.internal.RatpackScriptBacking
 import ratpack.manual.snippets.CodeSnippetTestCase
 import ratpack.manual.snippets.CodeSnippetTests
+import ratpack.manual.snippets.executer.GroovySnippetExecuter
+import ratpack.manual.snippets.executer.JavaSnippetExecuter
 import ratpack.manual.snippets.extractor.ManualSnippetExtractor
 import ratpack.manual.snippets.fixture.*
+import ratpack.test.embed.EmbeddedApp
 
 class ManualCodeSnippetTests extends CodeSnippetTestCase {
 
+  static delegate = new GroovyRatpackDslFixture()
+
   public static final LinkedHashMap<String, SnippetFixture> FIXTURES = [
     "language-groovy groovy-chain-dsl": new GroovyChainDslFixture(),
     "language-groovy groovy-ratpack"  : new GroovyRatpackDslFixture(),
     "language-groovy groovy-handlers" : new GroovyHandlersFixture(),
     "language-groovy gradle"          : new GradleFixture(),
     "language-groovy tested"          : new GroovyScriptFixture(),
-    "language-java"                   : new JavaExampleClassFixture(),
-    "language-java main"              : new JavaMainClassFixture()
+    "language-java"                   : new JavaClassFixture(),
+    "language-java hello-world"       : new HelloWorldAppSnippetFixture(new JavaSnippetExecuter()),
+    "language-groovy hello-world"     : new HelloWorldAppSnippetFixture(new GroovySnippetExecuter(true)) {
+      @Override
+      void around(NoArgAction action) throws Exception {
+        RatpackScriptBacking.withBacking({
+          def backing = new FullRatpackDslBacking()
+          backing.with(it)
+          EmbeddedApp.fromHandlers(Groovy.chain(backing.getClosures().handlers))
+        }, action.toRunnable())
+      }
+    }
   ]
 
   @Override

ratpack-manual/src/test/groovy/ratpack/manual/snippets/executer/GroovySnippetExecuter.java

@@ -44,7 +44,7 @@ public GroovySnippetExecuter(boolean compileStatic) {
   }
 
   @Override
-  public void execute(TestCodeSnippet snippet) {
+  public void execute(TestCodeSnippet snippet) throws Exception {
     CompilerConfiguration config = new CompilerConfiguration();
     config.addCompilationCustomizers(new CompilationCustomizer(CompilePhase.CONVERSION) {
       @Override
@@ -82,12 +82,7 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod
     ClassLoader previousContextClassLoader = Thread.currentThread().getContextClassLoader();
     try {
       Thread.currentThread().setContextClassLoader(groovyShell.getClassLoader());
-      fixture.setup();
-      try {
-        script.run();
-      } finally {
-        fixture.cleanup();
-      }
+      fixture.around(script::run);
     } finally {
       Thread.currentThread().setContextClassLoader(previousContextClassLoader);
     }

ratpack-manual/src/test/groovy/ratpack/manual/snippets/executer/JavaSnippetExecuter.groovy

@@ -18,6 +18,7 @@ package ratpack.manual.snippets.executer
 
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
+import ratpack.func.NoArgAction
 import ratpack.manual.snippets.TestCodeSnippet
 
 import javax.tools.*
@@ -70,7 +71,7 @@ public class JavaSnippetExecuter implements SnippetExecuter {
     try {
       Thread.currentThread().setContextClassLoader(classLoader)
       def mainMethod = exampleClass.getMethod("main", Class.forName("[Ljava.lang.String;"))
-      mainMethod.invoke(null, [[] as String[]] as Object[])
+      snippet.fixture.around({ mainMethod.invoke(null, [[] as String[]] as Object[]) } as NoArgAction)
     } catch (NoSuchMethodException ignore) {
       // Class has no test method
     } catch (InvocationTargetException e) {

ratpack-manual/src/test/groovy/ratpack/manual/snippets/fixture/GradleFixture.groovy

@@ -16,47 +16,49 @@
 
 package ratpack.manual.snippets.fixture
 
+import ratpack.func.NoArgAction
+
 import java.util.concurrent.locks.Condition
 import java.util.concurrent.locks.Lock
 import java.util.concurrent.locks.ReentrantLock
 
 class GradleFixture extends GroovyScriptFixture {
 
-	private final Lock lock = new ReentrantLock()
-	private final Condition available = lock.newCondition()
-	private volatile boolean busy
-
-	@Override
-	void setup() {
-		lock.lock()
-		while (busy) {
-			available.await()
-		}
-		busy = true
-	}
+  private final Lock lock = new ReentrantLock()
+  private final Condition available = lock.newCondition()
+  private volatile boolean busy
 
-	@Override
-	void cleanup() {
-		busy = false
-		available.signal()
-		lock.unlock()
-	}
+  @Override
+  void around(NoArgAction action) throws Exception {
+    try {
+      lock.lock()
+      while (busy) {
+        available.await()
+      }
+      busy = true
+      action.execute()
+    } finally {
+      busy = false
+      available.signal()
+      lock.unlock()
+    }
+  }
 
-	@Override
-	String pre() {
-		"""
+  @Override
+  String pre() {
+    """
 import org.gradle.tooling.GradleConnector
 import org.gradle.tooling.model.GradleProject
 
 def script = '''
 """
-	}
+  }
 
-	@Override
-	String post() {
-		String localRepo = System.getProperty("localRepo", "build/localrepo")
-		def localRepoPath = new File(localRepo).canonicalPath?.replaceAll("\\\\", "/")
-		"""
+  @Override
+  String post() {
+    String localRepo = System.getProperty("localRepo", "build/localrepo")
+    def localRepoPath = new File(localRepo).canonicalPath?.replaceAll("\\\\", "/")
+    """
 '''
 def projectDir = File.createTempDir()
 def buildFile = new File(projectDir, "build.gradle")
@@ -85,5 +87,5 @@ try {
   projectDir.deleteDir()
 }
 """
-	}
+  }
 }

ratpack-manual/src/test/groovy/ratpack/manual/snippets/fixture/GroovyChainDslFixture.groovy

@@ -18,14 +18,6 @@ package ratpack.manual.snippets.fixture
 
 class GroovyChainDslFixture extends GroovyScriptFixture {
 
-  @Override
-  public void setup() {
-  }
-
-  @Override
-  public void cleanup() {
-  }
-
   @Override
   public String pre() {
     """