Merge pull request #55 from aliaqa256/add-nodwell

Add nodwell in Roam

Author: shadowspore

geofence.go

@@ -22,6 +22,6 @@ func (gf *Geofence) Nearby(key string, lat, lon, meters float64) GeofenceQueryBu
 }
 
 // Roam geofence
-func (gf *Geofence) Roam(key, target, pattern string, meters int) GeofenceQueryBuilder {
-	return newGeofenceRoamQueryBuilder(gf.client, key, target, pattern, meters)
+func (gf *Geofence) Roam(key, target, pattern string, meters int, nodewell bool) GeofenceQueryBuilder {
+	return newGeofenceRoamQueryBuilder(gf.client, key, target, pattern, meters, nodewell)
 }

geofence_query_builder.go

@@ -20,6 +20,7 @@ type GeofenceQueryBuilder struct {
 	detectActions  []DetectAction
 	notifyCommands []NotifyCommand
 	searchOpts     searchOpts
+	isNodwell      bool
 }
 
 func newGeofenceQueryBuilder(client tile38Client, cmd, key string, area cmd) GeofenceQueryBuilder {
@@ -31,7 +32,7 @@ func newGeofenceQueryBuilder(client tile38Client, cmd, key string, area cmd) Geo
 	}
 }
 
-func newGeofenceRoamQueryBuilder(client tile38Client, key, target, pattern string, meters int) GeofenceQueryBuilder {
+func newGeofenceRoamQueryBuilder(client tile38Client, key, target, pattern string, meters int,nodwell bool) GeofenceQueryBuilder {
 	return GeofenceQueryBuilder{
 		client:      client,
 		cmd:         "NEARBY",
@@ -40,13 +41,19 @@ func newGeofenceRoamQueryBuilder(client tile38Client, key, target, pattern strin
 		target:      target,
 		pattern:     pattern,
 		meters:      meters,
+		isNodwell:   nodwell,
 	}
 }
 
+
 func (query GeofenceQueryBuilder) toCmd() cmd {
 	args := []string{query.key}
 	args = append(args, query.searchOpts.Args()...)
 	args = append(args, "FENCE")
+	if query.isNodwell {
+		args = append(args, "NODWELL")
+	}
+
 	if len(query.detectActions) > 0 {
 		actions := make([]string, len(query.detectActions))
 		for i := range query.detectActions {

query_test.go

@@ -14,9 +14,13 @@ func TestChannels(t *testing.T) {
 		Expected string
 	}{
 		{
-			Cmd:      channels.SetChan("foo", geofence.Roam("cat", "dog", "*", 50).Actions(Enter, Exit)).toCmd(),
+			Cmd:      channels.SetChan("foo", geofence.Roam("cat", "dog", "*", 50, false).Actions(Enter, Exit)).toCmd(),
 			Expected: "SETCHAN foo NEARBY cat FENCE DETECT enter,exit ROAM dog * 50",
 		},
+		{
+			Cmd:      channels.SetChan("foo", geofence.Roam("cat", "dog", "*", 50, true).Actions(Enter, Exit)).toCmd(),
+			Expected: "SETCHAN foo NEARBY cat FENCE NODWELL DETECT enter,exit ROAM dog * 50",
+		},
 	}
 
 	for _, test := range tests {
@@ -32,9 +36,13 @@ func TestHooks(t *testing.T) {
 		Expected string
 	}{
 		{
-			Cmd:      hooks.SetHook("foo", "localhost:1337", geofence.Roam("cat", "dog", "*", 50).Actions(Enter, Exit)).toCmd(),
+			Cmd:      hooks.SetHook("foo", "localhost:1337", geofence.Roam("cat", "dog", "*", 50, false).Actions(Enter, Exit)).toCmd(),
 			Expected: "SETHOOK foo localhost:1337 NEARBY cat FENCE DETECT enter,exit ROAM dog * 50",
 		},
+		{
+			Cmd:      hooks.SetHook("foo", "localhost:1337", geofence.Roam("cat", "dog", "*", 50, true).Actions(Enter, Exit)).toCmd(),
+			Expected: "SETHOOK foo localhost:1337 NEARBY cat FENCE NODWELL DETECT enter,exit ROAM dog * 50",
+		},
 	}
 
 	for _, test := range tests {
@@ -107,12 +115,19 @@ func TestGeofence(t *testing.T) {
 			Expected: "NEARBY fleet CLIP CURSOR 5 FENCE DETECT enter,exit,cross COMMANDS set,del HASHES 5 POINT 10 20 30",
 		},
 		{
-			Cmd: geofence.Roam("agent", "target", "*", 100).
+			Cmd: geofence.Roam("agent", "target", "*", 100, false).
 				Distance().
 				Wherein("price", 20, 30).
 				WhereEval("foo", "arg1", "arg2").toCmd(),
 			Expected: "NEARBY agent WHEREIN price 2 20 30 WHEREEVAL foo 2 arg1 arg2 DISTANCE FENCE ROAM target * 100",
 		},
+		{
+			Cmd: geofence.Roam("agent", "target", "*", 100, true).
+				Distance().
+				Wherein("price", 20, 30).
+				WhereEval("foo", "arg1", "arg2").toCmd(),
+			Expected: "NEARBY agent WHEREIN price 2 20 30 WHEREEVAL foo 2 arg1 arg2 DISTANCE FENCE NODWELL ROAM target * 100",
+		},
 		{
 			Cmd: geofence.Within("foo").
 				Bounds(10, 20, 30, 40).