Change template syntax to $(VARIABLE)

internal/pkg/templating/templating.go

@@ -35,17 +35,17 @@ func charState(l *lexer) stateFn {
 			l.tokens = append(l.tokens, l.input[l.start:l.pos])
 			return nil
 		}
+
 		char := l.input[l.pos]
-		switch char {
-		case '{':
-			l.tokens = append(l.tokens, l.input[l.start:l.pos])
+		var prevChar byte
+		if l.pos != 0 {
+			prevChar = l.input[l.pos-1]
+		}
+
+		if prevChar == '$' && char == '(' {
+			l.tokens = append(l.tokens, l.input[l.start:l.pos-1])
 			l.start, l.pos = l.pos+1, l.pos+1
 			return varState
-		case '}':
-			l.errMsg = fmt.Sprintf("Unexpected '}' at character %d", l.pos+1)
-			return nil
-		default:
-			continue
 		}
 	}
 }
@@ -56,12 +56,20 @@ func varState(l *lexer) stateFn {
 			l.errMsg = fmt.Sprintf("Template string terminates in a variable")
 			return nil
 		}
+
 		char := l.input[l.pos]
+		var prevChar byte
+		if l.pos != 0 {
+			prevChar = l.input[l.pos-1]
+		}
+
 		switch char {
-		case '{':
-			l.errMsg = fmt.Sprintf("Unexpected '{' at character %d", l.pos+1)
-			return nil
-		case '}':
+		case '(':
+			if prevChar == '$' {
+				l.errMsg = fmt.Sprintf("Illegal nested variable at character %d", l.pos)
+				return nil
+			}
+		case ')':
 			l.tokens = append(l.tokens, l.input[l.start:l.pos])
 			l.start, l.pos = l.pos+1, l.pos+1
 			return charState

internal/pkg/templating/templating_test.go

@@ -18,13 +18,14 @@
 package templating_test
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/turingincomplete/rif/internal/pkg/templating"
-	"testing"
 )
 
 func TestParse(t *testing.T) {
-	renderFunc, err := templating.Parse("The {THING}'s name was {NAME}")
+	renderFunc, err := templating.Parse("The $(THING)'s name was $(NAME)")
 	assert.Nil(t, err)
 
 	output, err := renderFunc(map[string]string{
@@ -46,12 +47,10 @@ func TestStringWithNoVariablesUnaltered(t *testing.T) {
 	assert.Equal(t, "No variables here", output)
 }
 
-func TestBracesShouldBeClosed(t *testing.T) {
+func TestVariablesShouldBeClosed(t *testing.T) {
 	testCases := []string{
-		" a} {b}",
-		"{a  {b}",
-		"{a}  b}",
-		"{a} {b ",
+		"$(a  $(b)",
+		"$(a) $(b ",
 	}
 
 	for _, testCase := range testCases {
@@ -60,11 +59,10 @@ func TestBracesShouldBeClosed(t *testing.T) {
 	}
 }
 
-func TestBracesShouldNotBeNested(t *testing.T) {
+func TestVariablesShouldNotBeNested(t *testing.T) {
 	testCases := []string{
-		"{ { }",
-		"{ } }",
-		"{ {} }",
+		"$($(a))",
+		"$($(a)",
 	}
 
 	for _, testCase := range testCases {
@@ -74,7 +72,7 @@ func TestBracesShouldNotBeNested(t *testing.T) {
 }
 
 func TestAllTemplateVariablesRequired(t *testing.T) {
-	renderFunc, err := templating.Parse("The {THING}'s name was {NAME}")
+	renderFunc, err := templating.Parse("The $(THING)'s name was $(NAME)")
 	assert.Nil(t, err)
 
 	_, err = renderFunc(map[string]string{

tests/acceptance-tests/test-data/body-params.rif

@@ -1,7 +1,7 @@
 rif_version: 0
 url: http://localhost:8080/body-params
 method: POST
-body: "Value: {BODY_VALUE}"
+body: "Value: $(BODY_VALUE)"
 variables:
   BODY_VALUE:
     type: string

tests/acceptance-tests/test-data/header-params.rif

@@ -2,7 +2,7 @@ rif_version: 0
 url: http://localhost:8080/header-params
 method: GET
 headers:
-  x-custom-header: "{HEADER_VALUE}"
+  x-custom-header: "$(HEADER_VALUE)"
 variables:
   HEADER_VALUE:
     type: string

tests/acceptance-tests/test-data/url-params.rif

@@ -1,5 +1,5 @@
 rif_version: 0
-url: http://localhost:8080/url-params?count={NUM_THINGS}
+url: http://localhost:8080/url-params?count=$(NUM_THINGS)
 method: GET
 variables:
   NUM_THINGS: