added support for ipv4 addresses as per #10

Author: pjdufour

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/spatialcurrent/go-dfl.svg)](https://travis-ci.org/spatialcurrent/go-dfl) [![GoDoc](https://godoc.org/github.com/spatialcurrent/go-dfl?status.svg)](https://godoc.org/github.com/spatialcurrent/go-dfl)
+[![Build Status](https://travis-ci.org/spatialcurrent/go-dfl.svg)](https://travis-ci.org/spatialcurrent/go-dfl) [![Go Report Card](https://goreportcard.com/badge/spatialcurrent/go-dfl)](https://goreportcard.com/report/spatialcurrent/go-dfl)  [![GoDoc](https://godoc.org/github.com/spatialcurrent/go-dfl?status.svg)](https://godoc.org/github.com/spatialcurrent/go-dfl) [![license](http://img.shields.io/badge/license-MIT-red.svg?style=flat)](https://github.com/go-spatial/tegola/blob/master/LICENSE.md)
 
 # go-dfl
 
@@ -43,32 +43,37 @@ With the `-env` flag you can use DFL filters against the current environment.
 ./dfl -env -f '@SHELL in [/bin/sh, /bin/bash]' && echo "Shell is set to sh or bash"
 ```
 
+**IP Address Information**
+
+You can use DFL to filter IP addresses.
+
+```
+./dfl -verbose -f '@ip in 10.10.0.0/16' ip=10.10.20.22
+# returns true as exit code 0
+```
+
 **OpenStreetMap**
 
 You can also use DFL to filter OpenStreetMap features.
 
 ```
-./dfl -verbose -filter '@pop > (10 - 2)' craft=brewery name=Stone pop=10
-true
-Done in 7.354125ms
+./dfl -f '@pop > (10 - 2)' craft=brewery name=Stone pop=10
+# returns true as exit code 0
 ```
 
 ```
-./dfl -verbose -filter '@craft like "brewery"' craft=brewery name=Stone pop=10
-true
-Done in 3.44965ms
+./dfl -f '@craft like "brewery"' craft=brewery name=Stone pop=10
+# returns true as exit code 0
 ```
 
 ```
-./dfl -verbose -filter '@craft like "brew%"' craft=brewery name=Stone pop=10
-true
-Done in 4.159278ms
+./dfl -f '@craft like "brew%"' craft=brewery name=Stone pop=10
+# returns true as exit code 0
 ```
 
 ```
-./dfl -verbose -filter '@craft ilike "Stone%"' craft=brewery name=Atlas pop=10
-false
-Done in 4.439012ms
+./dfl -f '@craft ilike "Stone%"' craft=brewery name=Atlas pop=10
+# returns true as exit code 0
 ```
 
 # Contributing

dfl/In.go

@@ -9,6 +9,7 @@ package dfl
 
 import (
 	"fmt"
+	"net"
 	//"reflect"
 	"strconv"
 	"strings"
@@ -49,13 +50,27 @@ func (i In) Evaluate(ctx Context, funcs FunctionMap) (interface{}, error) {
 	if err != nil {
 		return false, errors.Wrap(err, "Error evaulating expression "+i.Dfl())
 	}
-	lvs := fmt.Sprint(lv)
 
 	rv, err := i.Right.Evaluate(ctx, funcs)
 	if err != nil {
 		return false, errors.Wrap(err, "Error evaulating expression "+i.Dfl())
 	}
 
+	switch lv.(type) {
+	case net.IP:
+		lv_ip := lv.(net.IP)
+		switch rv.(type) {
+		case net.IPNet:
+			rv_net := rv.(net.IPNet)
+			return rv_net.Contains(lv_ip), nil
+		case *net.IPNet:
+			rv_net := rv.(*net.IPNet)
+			return rv_net.Contains(lv_ip), nil
+		}
+	}
+
+	lvs := fmt.Sprint(lv)
+
 	switch rv.(type) {
 	case string:
 		return strings.Contains(rv.(string), lvs), nil

dfl/TryConvertString.go

@@ -8,6 +8,7 @@
 package dfl
 
 import (
+	"net"
 	"strconv"
 	"strings"
 	"time"
@@ -74,5 +75,15 @@ func TryConvertString(s string) interface{} {
 		return left_time
 	}
 
+	left_ipv4 := net.ParseIP(s)
+	if left_ipv4 != nil {
+		return left_ipv4
+	}
+
+	_, left_net, err := net.ParseCIDR(s)
+	if err == nil {
+		return left_net
+	}
+
 	return s
 }

dfl/TryConvertString_test.go

@@ -8,6 +8,7 @@
 package dfl
 
 import (
+	"net"
 	"reflect"
 	"testing"
 	"time"
@@ -63,3 +64,29 @@ func TestTryConvertStringTimes(t *testing.T) {
 	}
 
 }
+
+
+func TestTryConvertStringIPv4(t *testing.T) {
+
+	testCases := []struct {
+		in   string
+		want interface{}
+	}{
+		{in: "192.168.2.1", want: net.ParseIP("192.168.2.1")},
+		{in: "10.10.1.1", want: net.ParseIP("10.10.1.1")},
+	}
+
+	for _, testCase := range testCases {
+		got := TryConvertString(testCase.in)
+		want := testCase.want.(net.IP)
+		switch got.(type) {
+		case net.IP:
+			if !got.(net.IP).Equal(want) {
+				t.Errorf("TryConvertString(%q) == %v (%q), want %v (%q)", testCase.in, got, reflect.TypeOf(got), testCase.want, reflect.TypeOf(testCase.want))
+			}
+		default:
+			t.Errorf("TryConvertString(%q) == %v (%q), want %v (%q)", testCase.in, got, reflect.TypeOf(got), testCase.want, reflect.TypeOf(testCase.want))
+		}
+	}
+
+}