add additional delimiter for yaml paths

Author: herrjulz

cmd/goml/main.go

@@ -20,7 +20,7 @@ func main() {
 	}
 	cmd.Name = "goml"
 	cmd.Usage = "CLI Tool to do CRUD like manipulation on YAML files"
-	cmd.Version = "0.2.0"
+	cmd.Version = "0.3.0"
 	cmd.Commands = []cli.Command{
 		{
 			Name:   "get",

delete.go

@@ -82,7 +82,7 @@ func Delete(yml *simpleyaml.Yaml, path string) error {
 		return nil
 	}
 
-	if strings.Contains(propName, ":") {
+	if strings.Contains(propName, ":") || strings.Contains(propName, "|") {
 		tmp, props := get(yml, newPath)
 		prop, err := tmp.Array()
 		if err != nil {

delete_test.go

@@ -83,4 +83,41 @@ mapArray:
 		_, err = Get(yml, "mapArray.foo:bar.arr.:two")
 		Expect(err).To(MatchError("property not found"))
 	})
+
+	Context("Using the | delimiter", func() {
+		It("should delete a value from an array ", func() {
+			err = Delete(yml, "array.0")
+			Expect(err).NotTo(HaveOccurred())
+
+			_, err := Get(yml, "array.|bar")
+			Expect(err).To(MatchError("property not found"))
+
+			err = Delete(yml, "array.|zar")
+			Expect(err).NotTo(HaveOccurred())
+			_, err = Get(yml, "array.|zar")
+			Expect(err).To(MatchError("property not found"))
+		})
+
+		It("should delete a value from an map inside an array ", func() {
+			err = Delete(yml, "mapArray.foo|bar.zoo")
+			Expect(err).NotTo(HaveOccurred())
+
+			_, err := Get(yml, "mapArray.foo|bar.zoo")
+			Expect(err).To(HaveOccurred())
+		})
+
+		It("should delete a value from an array inside a map which in turn is inside an array ", func() {
+			err = Delete(yml, "mapArray.foo|bar.arr.0")
+			Expect(err).NotTo(HaveOccurred())
+
+			_, err := Get(yml, "mapArray.foo|bar.arr.|one")
+			Expect(err).To(MatchError("property not found"))
+
+			err = Delete(yml, "mapArray.foo|bar.arr.|two")
+			Expect(err).NotTo(HaveOccurred())
+
+			_, err = Get(yml, "mapArray.foo|bar.arr.|two")
+			Expect(err).To(MatchError("property not found"))
+		})
+	})
 })

get.go

@@ -65,7 +65,7 @@ func get(yml *simpleyaml.Yaml, path string) (*simpleyaml.Yaml, []string) {
 			continue
 		}
 
-		if strings.Contains(p, ":") {
+		if strings.Contains(p, ":") || strings.Contains(p, "|") {
 			if prop, err := yml.Array(); err == nil {
 				index, err := returnIndexForProp(p, prop)
 				if err != nil {

get20.go

@@ -1,5 +1,5 @@
 package goml
 
-func Get(file []byte, path string) (string, error) {
+//func Get(file []byte, path string) (string, error) {
 
-}
+//}

get_test.go

@@ -60,4 +60,24 @@ mapArray:
 		Expect(err).NotTo(HaveOccurred())
 		Expect(value).To(Equal("one"))
 	})
+
+	Context("Using the | delimiter", func() {
+		It("should get a value from a array inside a map", func() {
+			value, err := Get(yml, "mapArray.foo|bar.arr.0")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(value).To(Equal("one"))
+		})
+
+		It("should get a vlaue from a map", func() {
+			value, err := Get(yml, "mapArray.foo|var.boo")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(value).To(Equal("laa"))
+		})
+
+		It("should get a value form an array", func() {
+			value, err := Get(yml, "array.|var")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(value).To(Equal("var"))
+		})
+	})
 })

set.go

@@ -118,7 +118,7 @@ func Set(yml *simpleyaml.Yaml, path string, val interface{}) error {
 		return nil
 	}
 
-	if strings.Contains(propName, ":") {
+	if strings.Contains(propName, ":") || strings.Contains(propName, "|") {
 		tmp, props := get(yml, newPath)
 		prop, err := tmp.Array()
 		if err != nil {

set_test.go

@@ -69,4 +69,18 @@ mapArray:
 			Expect(Get(yml, "mapArray.luffy:gomugomuno.beat")).To(Equal("katakuri"))
 		})
 	})
+
+	Context("using the | delimiter", func() {
+		It("should add an value to an array", func() {
+			err = Set(yml, "mapArray.foo|var.boo", "baymax")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(Get(yml, "mapArray.foo|var.boo")).To(Equal("baymax"))
+			err = Set(yml, "array.+", "pikachu")
+			Expect(Get(yml, "array.|pikachu")).To(Equal("pikachu"))
+			err = Set(yml, "array.|pikachu", "ruffy")
+			Expect(Get(yml, "array.|ruffy")).To(Equal("ruffy"))
+			err = Set(yml, "mapArray.foo|bar.arr.0", "new")
+			Expect(Get(yml, "mapArray.foo|bar.arr.0")).To(Equal("new"))
+		})
+	})
 })

utils.go

@@ -108,6 +108,10 @@ func ReadYamlFromFile(filename string) (*simpleyaml.Yaml, error) {
 
 func returnIndexForProp(propName string, array []interface{}) (int, error) {
 	keyVal := strings.Split(propName, ":")
+	if len(keyVal) < 2 {
+		keyVal = strings.Split(propName, "|")
+	}
+
 	key, val := keyVal[0], keyVal[1]
 
 	for i, _ := range array {
@@ -131,6 +135,10 @@ func returnIndexForProp(propName string, array []interface{}) (int, error) {
 
 func createArrayEntry(propName string, array *[]interface{}) int {
 	keyVal := strings.Split(propName, ":")
+	if len(keyVal) < 2 {
+		keyVal = strings.Split(propName, "|")
+	}
+
 	key, val := keyVal[0], keyVal[1]
 	fmt.Println("KEY:", key, "VAL", val)
 	m := make(map[interface{}]interface{})