Merge pull request #36 from oyakovlev/helper_fixes

fixes for renderPartial helper

.github/workflows/gradle.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

README.md

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock.tools:shaper-core:0.5.0")
+    implementation("dev.icerock.tools:shaper-core:0.5.1")
 }
 ```
 

build.gradle.kts

@@ -16,5 +16,5 @@ buildscript {
 
 subprojects {
     group = "dev.icerock.tools"
-    version = "0.5.0"
+    version = "0.5.1"
 }

install-shaper.sh

@@ -1,10 +1,10 @@
 mkdir -p ~/.shaper && \
 cd ~/.shaper && \
-curl -L -s "https://github.com/icerockdev/shaper/releases/download/release%2F0.5.0/shaper-cli-0.5.0.zip" > cli.zip && \
+curl -L -s "https://github.com/icerockdev/shaper/releases/download/release%2F0.5.1/shaper-cli-0.5.1.zip" > cli.zip && \
 unzip -q cli.zip && \
 rm cli.zip && \
 rm -rf shaper-cli || true && \
-mv shaper-cli-0.5.0 shaper-cli && \
+mv shaper-cli-0.5.1 shaper-cli && \
 echo "repositories:" > config.yaml && \
 echo 'To complete setup add into your environments: export PATH=~/.shaper/shaper-cli/bin:$PATH'
 echo 'After it you can call shaper by command: shaper-cli -i <input yaml> -o <output dir>'

shaper-core/src/main/kotlin/dev/icerock/tools/shaper/core/HandlebarsFactory.kt

@@ -24,7 +24,7 @@ object HandlebarsFactory {
         })
 
         handlebars.registerHelper("renderPartial", Helper<String> { context, options ->
-            handlebars.compile(context).apply(options.hash)
+            handlebars.compile(context).apply(options.context.combine(options.hash))
         })
 
         registerConditionHelpers(handlebars)