Merge pull request #8 from bminer/master

Support decoding of multiple series

client.go

@@ -185,8 +185,7 @@ func (c *helperClient) DecodeQuery(q string, result interface{}) (err error) {
 		return
 	}
 
-	series := results[0].Series[0]
-	err = decode(series, result)
+	err = decode(results[0].Series, result)
 
 	return
 }

decode.go

@@ -8,36 +8,36 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-
-
 // Decode is used to process data returned by an InfluxDb query and uses reflection
 // to transform it into an array of structs of type result.
 //
 // This function is used internally by the Query function.
-func decode(influxResult influxModels.Row, result interface{}) error {
+func decode(influxResult []influxModels.Row, result interface{}) error {
 	influxData := make([]map[string]interface{}, 0)
 
-	for _, v := range influxResult.Values {
-		r := make(map[string]interface{})
-		for i, c := range influxResult.Columns {
-			if len(v) >= i+1 {
-				r[c] = v[i]
+	for _, series := range influxResult {
+		for _, v := range series.Values {
+			r := make(map[string]interface{})
+			for i, c := range series.Columns {
+				if len(v) >= i+1 {
+					r[c] = v[i]
+				}
 			}
-		}
-		for tag, val := range influxResult.Tags {
-			r[tag] = val
-		}
-		r["InfluxMeasurement"] = influxResult.Name
+			for tag, val := range series.Tags {
+				r[tag] = val
+			}
+			r["InfluxMeasurement"] = series.Name
 
-		influxData = append(influxData, r)
+			influxData = append(influxData, r)
+		}
 	}
 
 	config := &mapstructure.DecoderConfig{
-		Metadata: nil,
-		Result: result,
-		TagName: "influx",
+		Metadata:         nil,
+		Result:           result,
+		TagName:          "influx",
 		WeaklyTypedInput: false,
-		ZeroFields: false,
+		ZeroFields:       false,
 		DecodeHook: func(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
 			if t == reflect.TypeOf(time.Time{}) && f == reflect.TypeOf("") {
 				return time.Parse(time.RFC3339, data.(string))

decode_test.go

@@ -59,7 +59,7 @@ func TestDecode(t *testing.T) {
 
 	decoded := []DecodeType{}
 
-	err := decode(data, &decoded)
+	err := decode([]influxModels.Row{data}, &decoded)
 	if err != nil {
 		t.Error("Error decoding: ", err)
 	}
@@ -87,7 +87,7 @@ func TestDecodeMissingColumn(t *testing.T) {
 	expected := []DecodeType{{1, 0}}
 	data.Values = append(data.Values, []interface{}{1})
 	decoded := []DecodeType{}
-	err := decode(data, &decoded)
+	err := decode([]influxModels.Row{data}, &decoded)
 
 	if err != nil {
 		t.Error("UnExpected error decoding: ", data, &decoded)
@@ -117,7 +117,7 @@ func TestDecodeWrongType(t *testing.T) {
 	expected := []DecodeType{{1, 2.0}}
 	data.Values = append(data.Values, []interface{}{1.0, 2})
 	decoded := []DecodeType{}
-	err := decode(data, &decoded)
+	err := decode([]influxModels.Row{data}, &decoded)
 	if err != nil {
 		t.Error("Unexpected error decoding: ", err, data, decoded)
 	}
@@ -152,7 +152,7 @@ func TestDecodeTime(t *testing.T) {
 	expected := []DecodeType{{ti, 2.0}}
 	data.Values = append(data.Values, []interface{}{timeS, 2.0})
 	decoded := []DecodeType{}
-	err = decode(data, &decoded)
+	err = decode([]influxModels.Row{data}, &decoded)
 
 	if err != nil {
 		t.Error("Error decoding: ", err)
@@ -182,7 +182,7 @@ func TestDecodeJsonNumber(t *testing.T) {
 	expected := []DecodeType{{1, 2.0}}
 	data.Values = append(data.Values, []interface{}{json.Number("1"), json.Number("2.0")})
 	decoded := []DecodeType{}
-	err := decode(data, &decoded)
+	err := decode([]influxModels.Row{data}, &decoded)
 
 	if err != nil {
 		t.Error("Error decoding: ", err)
@@ -212,7 +212,7 @@ func TestDecodeUnsedStructValue(t *testing.T) {
 	expected := []DecodeType{{1, 0}}
 	data.Values = append(data.Values, []interface{}{1, 1.1})
 	decoded := []DecodeType{}
-	err := decode(data, &decoded)
+	err := decode([]influxModels.Row{data}, &decoded)
 
 	if err != nil {
 		t.Error("Error decoding: ", err)
@@ -243,7 +243,7 @@ func TestDecodeMeasure(t *testing.T) {
 	expected := []DecodeType{{"bla", 1, 0}}
 	data.Values = append(data.Values, []interface{}{1, 1.1})
 	decoded := []DecodeType{}
-	err := decode(data, &decoded)
+	err := decode([]influxModels.Row{data}, &decoded)
 
 	if decoded[0].InfluxMeasurement != expected[0].InfluxMeasurement {
 		t.Error("Decoded Wrong measure")

encode_test.go

@@ -32,13 +32,13 @@ func TestEncodeSetsMesurment(t *testing.T) {
 
 func TestEncodeUsesTimeField(t *testing.T) {
 	type MyType struct {
-		MyTimeField             time.Time `influx:"my_time_field"`
-		Val string `influx:"val"`
+		MyTimeField time.Time `influx:"my_time_field"`
+		Val         string    `influx:"val"`
 	}
 
 	td, _ := time.Parse(time.RFC822, "27 Oct 78 15:04 PST")
 
-	d := &MyType{td,"test-data"}
+	d := &MyType{td, "test-data"}
 	tv, _, _, _, err := encode(d, &usingValue{"my_time_field", false})
 
 	if tv != td {
@@ -52,16 +52,16 @@ func TestEncodeUsesTimeField(t *testing.T) {
 
 func TestEncode(t *testing.T) {
 	type MyType struct {
-		InfluxMeasurement      Measurement
-		Time             time.Time `influx:"time"`
-		TagValue         string    `influx:"tagValue,tag"`
-		TagAndFieldValue string    `influx:"tagAndFieldValue,tag,field"`
-		IntValue         int       `influx:"intValue"`
-		FloatValue       float64   `influx:"floatValue"`
-		BoolValue        bool      `influx:"boolValue"`
-		StringValue      string    `influx:"stringValue"`
-		StructFieldName  string    `influx:""`
-		IgnoredValue     string    `influx:"-"`
+		InfluxMeasurement Measurement
+		Time              time.Time `influx:"time"`
+		TagValue          string    `influx:"tagValue,tag"`
+		TagAndFieldValue  string    `influx:"tagAndFieldValue,tag,field"`
+		IntValue          int       `influx:"intValue"`
+		FloatValue        float64   `influx:"floatValue"`
+		BoolValue         bool      `influx:"boolValue"`
+		StringValue       string    `influx:"stringValue"`
+		StructFieldName   string    `influx:""`
+		IgnoredValue      string    `influx:"-"`
 	}
 
 	d := MyType{