#19, kotlin dsl support

Author: hauner

src/main/groovy/com/github/hauner/openapi/gradle/OpenApiProcessorExtension.groovy

@@ -16,6 +16,7 @@
 
 package com.github.hauner.openapi.gradle
 
+import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.MapProperty
@@ -82,6 +83,46 @@ class OpenApiProcessorExtension {
         processors = objectFactory.mapProperty (String, Processor)
     }
 
+    /**
+     * groovy/kotlin dsl. create a new processor configuration.
+     *
+     * <pre>
+     *  openapiProcessor {
+     *    process("newProcessor") { ... }
+     * }
+     * </pre>
+     *
+     * @param name unique name of the processor
+     * @param args {@link Processor} action
+     * @return the new processor
+     */
+    Processor process(String name, Action<Processor> action) {
+        def processor = new Processor (name)
+        action.execute (processor)
+        processors.put (name, processor)
+    }
+
+    /**
+     * groovy dsl only. create a new processor configuration.
+     *
+     * <pre>
+     *  openapiProcessor {
+     *    newProcessor { ... }
+     * }
+     * </pre>
+     *
+     * gradle will never call this from a kotlin build script unless explicitly calling it, i.e.
+     *
+     * <pre>
+     *  openapiProcessor {
+     *    methodMissing "newProcessor" { ... }
+     * }
+     * </pre>
+     *
+     * @param name unique name of the processor
+     * @param args arg array. arg[0] must be a {@link Processor} configuration block
+     * @return the new processor
+     */
     def methodMissing (String name, def args) {
         def arg = args[0]
 

src/main/groovy/com/github/hauner/openapi/gradle/Processor.groovy

@@ -63,6 +63,18 @@ class Processor {
         other.put (API_PATH, path)
     }
 
+    void prop (Map<String, Object> props) {
+        other.putAll (props)
+    }
+
+    void prop (String key, Object value) {
+        other.put (key, value)
+    }
+
+    void prop (GString key, Object value) {
+        other.put (key.toString (), value)
+    }
+
     def methodMissing (String name, def args) {
         if (args[0] instanceof Closure) {
             def builder = new MapBuilder()

src/test/groovy/com/github/hauner/openapi/gradle/OpenApiProcessorExtensionSpec.groovy

@@ -42,7 +42,7 @@ class OpenApiProcessorExtensionSpec extends Specification {
         ex.apiPath.get () == "openapi.yaml"
     }
 
-    void "converts processor closure to map" () {
+    void "converts processor closure to map via methodMissing" () {
         project.configure (_, _) >> { args ->
             Closure c = args[1]
             c.delegate = args[0]
@@ -67,6 +67,25 @@ class OpenApiProcessorExtensionSpec extends Specification {
         ex.processors.get ().test2.other.two == "b2"
     }
 
+    void "converts processor properties to map via process()/prop() methods" () {
+        when:
+        def ex = new OpenApiProcessorExtension (project, objectFactory)
+        ex.process ("test") {
+            it.prop ("one", "a")
+            it.prop ("two", "b")
+        }
+        ex.process ("test2") {
+            it.prop ("one", "a2")
+            it.prop ("two", "b2")
+        }
+
+        then:
+        ex.processors.get ().test.other.one == "a"
+        ex.processors.get ().test.other.two == "b"
+        ex.processors.get ().test2.other.one == "a2"
+        ex.processors.get ().test2.other.two == "b2"
+    }
+
     void "handle apiPath when given as GString" () {
         def projectDir = "projectDir"
 

src/test/groovy/com/github/hauner/openapi/gradle/ProcessorSpec.groovy

@@ -19,13 +19,13 @@ package com.github.hauner.openapi.gradle
 import spock.lang.Specification
 
 class ProcessorSpec extends Specification {
-    
+
     void "gets & sets named props" () {
         def processor = new Processor('test')
-        
+
         when:
         processor."${prop}" (value)
-        
+
         then:
         processor."get${prop.capitalize ()}"() == value
 
@@ -35,7 +35,7 @@ class ProcessorSpec extends Specification {
         'targetDir' | 'target folder'
     }
 
-    void "maps unknown properties" () {
+    void "maps unknown properties via methodMissing" () {
         def processor = new Processor('test')
 
         when:
@@ -45,7 +45,7 @@ class ProcessorSpec extends Specification {
         processor.other.unknown == 'foo'
     }
 
-    void "maps nested properties" () {
+    void "maps nested properties via methodMissing" () {
         def processor = new Processor('test')
 
         when:
@@ -65,4 +65,36 @@ class ProcessorSpec extends Specification {
         processor.other.test.three.five == 'd'
     }
 
+    void "maps unknown properties via prop()" () {
+        def processor = new Processor('test')
+
+        when:
+        processor.prop ('foo', "any")
+        processor.prop ("foo2", "any2")
+
+        then:
+        processor.other.foo == 'any'
+        processor.other.foo2 == 'any2'
+    }
+
+    void "maps nested properties via prop()" () {
+        def processor = new Processor('test')
+
+        when:
+        processor.prop("test", [
+            one: "a",
+            two: "b",
+            three: [
+                four: "c",
+                five: "d"
+            ]
+        ])
+
+        then:
+        processor.other.test.one == 'a'
+        processor.other.test.two == 'b'
+        processor.other.test.three.four == 'c'
+        processor.other.test.three.five == 'd'
+    }
+
 }