Merge pull request #24 from mindstand/cli_patch

Cli patch
z5labs · Dec 6, 2019 · e146988 · e146988
2 parents 1d47505 + b828f2a
commit e146988
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 87 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -39,6 +39,16 @@ jobs:
             curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
             dep ensure
         fi
+    - name: Setup gogmcli test
+      run: |
+        export ROOTDIR=`pwd`
+        rm testing_/linking.go
+        cd cmd/gogmcli
+        go build .
+        mv gogmcli $ROOTDIR/testing_/gogmcli
+        cd $ROOTDIR/testing_
+        ./gogmcli gen .
+        cd $ROOTDIR
     - name: Build
       run: go build -v .
     - name: Run Unit Tests

diff --git a/cmd/gogmcli/gen/parse.go b/cmd/gogmcli/gen/parse.go
@@ -23,6 +23,7 @@ import (
 	"bytes"
 	"errors"
 	go_cypherdsl "github.com/mindstand/go-cypherdsl"
+	"github.com/mindstand/gogm/cmd/gogmcli/util"
 	"go/ast"
 	"go/parser"
 	"go/printer"
@@ -185,15 +186,15 @@ func parseGogmNode(strType *ast.StructType, confs *map[string][]*relConf, label
 					if !strings.Contains(part, "gogm") {
 						continue
 					}
-					part = strings.Replace(strings.Replace(part, "`gogm:", "", -1), "\"", "", -1)
+					part = util.RemoveFromString(part, "gogm:", "\"", "`")
 					if strings.Contains(part, "relationship") && strings.Contains(part, "direction") {
 						gogmParts := strings.Split(part, ";")
 
 						var dir go_cypherdsl.Direction
 						var relName string
 						for _, p := range gogmParts {
 							if strings.Contains(p, "direction") {
-								str := strings.ToLower(strings.Replace(strings.Replace(strings.Replace(p, "direction=", "", -1), "\"", "", -1), "`", "", -1))
+								str := util.RemoveFromString(p, "direction=", "\"")
 								switch str {
 								case "incoming":
 									dir = go_cypherdsl.DirectionIncoming
@@ -212,7 +213,7 @@ func parseGogmNode(strType *ast.StructType, confs *map[string][]*relConf, label
 									continue fieldLoop
 								}
 							} else if strings.Contains(part, "relationship") {
-								relName = strings.ToLower(strings.Replace(strings.Replace(p, "relationship=", "", -1), "\"", "", -1))
+								relName = strings.ToLower(util.RemoveFromString(p, "relationship=", "\"", "`"))
 							}
 						}
 

diff --git a/cmd/gogmcli/util/util.go b/cmd/gogmcli/util/util.go
@@ -19,6 +19,8 @@
 
 package util
 
+import "strings"
+
 // RemoveDuplicates removes duplicates from string slice
 func RemoveDuplicates(s []string) []string {
 	if s == nil {
@@ -38,6 +40,14 @@ func RemoveDuplicates(s []string) []string {
 	return s[:j]
 }
 
+func RemoveFromString(original string, removals ...string) string {
+	for _, r := range removals {
+		original = strings.Replace(original, r, "", -1)
+	}
+
+	return original
+}
+
 func StringSliceContains(s []string, e string) bool {
 	for _, a := range s {
 		if a == e {

diff --git a/testing_/linking.go b/testing_/linking.go
diff --git a/testing_/test_obj.go b/testing_/test_obj.go
@@ -24,7 +24,7 @@ import "github.com/mindstand/gogm"
 type ExampleObject struct {
 	gogm.BaseNode
 
-	Children []*ExampleObject `gogm:"direction=incoming;relationship=test" json:"children"`
+	Children []*ExampleObject `json:"children" gogm:"direction=incoming;relationship=test"`
 	Parents  *ExampleObject   `gogm:"direction=outgoing;relationship=test" json:"parents"`
 	Special  *SpecialEdge     `gogm:"direction=incoming;relationship=special" json:"special"`
 }