release v1.7.0-beta-5

Author: mandelsoft

README.md

@@ -1621,7 +1621,7 @@ list:
 contains: true
 ```
 
-The function `contains` also works on strings to look for sub strings.
+The function `contains` also works on strings to look for sub strings or maps to look for a key. In those cases the element must be a string.
 
 e.g.:
 

dynaml/contains.go

@@ -1,9 +1,10 @@
 package dynaml
 
 import (
-	"github.com/mandelsoft/spiff/yaml"
 	"strconv"
 	"strings"
+
+	"github.com/mandelsoft/spiff/yaml"
 )
 
 func func_contains(arguments []interface{}, binding Binding) (interface{}, EvaluationInfo, bool) {
@@ -14,6 +15,18 @@ func func_contains(arguments []interface{}, binding Binding) (interface{}, Evalu
 	}
 
 	switch val := arguments[0].(type) {
+	case map[string]yaml.Node:
+		elem := arguments[1]
+		if elem == nil {
+			return false, info, true
+		}
+		key, ok := elem.(string)
+		if !ok {
+			return false, info, true
+		}
+		_, ok = val[key]
+		return ok, info, true
+
 	case []yaml.Node:
 		if arguments[1] == nil {
 			return false, info, true

dynaml/exec.go

@@ -135,6 +135,7 @@ func cachedExecute(cache ExecCache, content *string, args []string) ([]byte, err
 	if content != nil {
 		h.Write([]byte(*content))
 	}
+	args[0] = FilePath(args[0])
 	for _, arg := range args {
 		h.Write([]byte(arg))
 	}

dynaml/registry.go

@@ -58,5 +58,5 @@ func (r *registry) IsTemplateControlOption(name string) bool {
 
 func DefaultRegistry() Registry {
 	var r *registry
-	return r // standard beaviour support on nil pointer inter
+	return r // standard behaviour support on nil pointer inter
 }

dynaml/write.go

@@ -97,6 +97,16 @@ func getWriteOptions(arg interface{}, wopt WriteOpts, permonly bool) (WriteOpts,
 	return wopt, err
 }
 
+func FilePath(file string) string {
+	if strings.HasPrefix(file, "~/") {
+		home := os.Getenv("HOME")
+		if home != "" {
+			file = home + file[1:]
+		}
+	}
+	return file
+}
+
 func getData(file string, wopt WriteOpts, key interface{}, value interface{}, yaml bool) (string, string, []byte, bool) {
 	var data []byte
 	var err error
@@ -110,5 +120,5 @@ func getData(file string, wopt WriteOpts, key interface{}, value interface{}, ya
 	} else {
 		data = []byte(str)
 	}
-	return removeTags(file), str, data, err == nil
+	return FilePath(removeTags(file)), str, data, err == nil
 }

flow/flow_test.go

@@ -3625,6 +3625,28 @@ uniq:
 	})
 
 	Describe("when calling contains", func() {
+		It("handes maps", func() {
+			source := parseYAML(`
+---
+map:
+ a: alice
+ b: bob
+contains:
+  a: (( contains(map, "a") ))
+  c: (( contains(map, "c") ))
+`)
+			resolved := parseYAML(`
+---
+contains:
+  a: true
+  c: false
+map:
+  a: alice
+  b: bob
+`)
+			Expect(source).To(FlowAs(resolved))
+		})
+
 		It("finds ints", func() {
 			source := parseYAML(`
 ---

flow/state.go

@@ -297,6 +297,7 @@ func (s *State) Cleanup() {
 func (s *State) GetFileContent(file string, cached bool) ([]byte, error) {
 	var err error
 
+	file = dynaml.FilePath(file)
 	data := s.fileCache[file]
 	if !cached || data == nil {
 		debug.Debug("reading file %s\n", file)

flow/version.go

@@ -1,3 +1,3 @@
 package flow
 
-var VERSION = "v1.7.0-beta-4"
+var VERSION = "v1.7.0-beta-5"

spiffing/interface.go

@@ -30,6 +30,9 @@ type Options = flow.Options
 // the standard function set
 type Functions = dynaml.Functions
 
+// Function is the signature of a dynaml function
+type Function = dynaml.Function
+
 // Controls provides access to a set of spiff controls used to extend
 // the standard control set
 type Controls = dynaml.Controls

spiffing/spiff.go

@@ -92,6 +92,7 @@ func New() Spiff {
 		key:      features.EncryptionKey(),
 		mode:     MODE_DEFAULT,
 		features: features.Features(),
+		registry: dynaml.DefaultRegistry(),
 	}
 }
 
@@ -102,6 +103,7 @@ func Plain() Spiff {
 		key:      "",
 		mode:     MODE_DEFAULT,
 		features: features.FeatureFlags{},
+		registry: dynaml.DefaultRegistry(),
 	}
 }