refactor: minor code refacotr

generator.go

@@ -2,7 +2,9 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"math/rand"
+	"strconv"
 	"time"
 )
 
@@ -12,7 +14,38 @@ func init() {
 
 type GeneratorFunc func(n int) string
 
-var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+const (
+	GeneratorString = "string"
+	GeneratorInt    = "int"
+)
+
+var (
+	generator = map[string]GeneratorFunc{
+		GeneratorString: generateString,
+		GeneratorInt:    generateInt,
+	}
+
+	letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+)
+
+func generate(tokens []string) string {
+	if len(tokens) != 2 {
+		log.Println("error: invalid number of arguments in generator")
+		return ""
+	}
+
+	if gen, ok := generator[tokens[0]]; ok {
+		val, err := strconv.Atoi(tokens[1])
+		if err != nil {
+			log.Println("error: ", err)
+		}
+
+		return gen(val)
+	}
+
+	log.Println("error: specified generator not found")
+	return ""
+}
 
 func generateString(n int) string {
 	b := make([]rune, n)

response.go

@@ -3,30 +3,13 @@ package main
 import (
 	"log"
 	"regexp"
-	"strconv"
 	"strings"
 )
 
 const (
 	ResolverGenerator = "generate"
 	ResolverCopy      = "copy"
-	ResolverCustom    = "custom"
-
-	GeneratorString = "string"
-	GeneratorInt    = "int"
-
-	CustomConstant = "constant"
-)
-
-var (
-	generator = map[string]GeneratorFunc{
-		GeneratorString: generateString,
-		GeneratorInt:    generateInt,
-	}
-
-	call = map[string]callerFunc{
-		CustomConstant: callConcat,
-	}
+	ResolverCall      = "call"
 )
 
 type Response struct {
@@ -75,7 +58,7 @@ func resolve(key string, tokens []string, data collector) string {
 	case ResolverCopy:
 		return copyFrom(tokens, data)
 
-	case ResolverCustom:
+	case ResolverCall:
 		return customCall(data, tokens)
 	}
 
@@ -90,35 +73,3 @@ func copyFrom(tokens []string, data collector) string {
 
 	return data.get(tokens[0], tokens[1])
 }
-
-func generate(tokens []string) string {
-	if len(tokens) != 2 {
-		log.Println("error: invalid number of arguments in generator")
-		return ""
-	}
-
-	if gen, ok := generator[tokens[0]]; ok {
-		val, err := strconv.Atoi(tokens[1])
-		if err != nil {
-			log.Println("error: ", err)
-		}
-
-		return gen(val)
-	}
-
-	log.Println("error: specified generator not found")
-	return ""
-}
-
-func customCall(data collector, tokens []string) string {
-	if len(tokens) < 1 {
-		log.Println("error: invalid number of arguments in call")
-		return ""
-	}
-
-	if caller, ok := call[tokens[0]]; ok {
-		return caller(data, tokens[1:]...)
-	}
-
-	return ""
-}

test/app/create_users.json

@@ -5,7 +5,7 @@
     {
       "response": {
         "label": "create",
-        "body": "{\"id\":\"{{ generate string 14 }}\",\"firstname\":\"{{ copy body firstname }}\",\"lastname\":\"{{ custom constant }}\",\"last_seen\":\"{{ copy body option.status }}\"}",
+        "body": "{\"id\":\"{{ generate string 14 }}\",\"firstname\":\"{{ copy body firstname }}\",\"lastname\":\"{{ call custom }}\",\"last_seen\":\"{{ copy body option.status }}\"}",
         "latency": 0,
         "status_code": 201,
         "headers": {

test/app/get_user.json

@@ -25,7 +25,7 @@
         "label": "search",
         "body": "{\"id\":2,\"firstname\":\"John\",\"lastname\":\"Snow\",\"last_seen\":\"The Iron Throne\"}",
         "latency": 0,
-        "status_code": 201,
+        "status_code": 200,
         "headers": {
           "Content-Type": "application/json"
         }