Added Version type & functions

Author: ewoutp

client.go

@@ -52,7 +52,7 @@ type VersionInfo struct {
 	Server string `json:"server,omitempty"`
 	//  The server version string. The string has the format "major.minor.sub".
 	// Major and minor will be numeric, and sub may contain a number or a textual version.
-	Version string `json:"version,omitempty"`
+	Version Version `json:"version,omitempty"`
 	// Type of license of the server
 	License string `json:"license,omitempty"`
 	// Optional additional details. This is returned only if the context is configured using WithDetails.

test/version_test.go

@@ -0,0 +1,90 @@
+//
+// DISCLAIMER
+//
+// Copyright 2017 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Ewout Prangsma
+//
+
+package test
+
+import (
+	"testing"
+
+	driver "github.com/arangodb/go-driver"
+)
+
+// TestVersion tests Version functions.
+func TestVersion(t *testing.T) {
+
+	tests := []struct {
+		Input    driver.Version
+		Major    int
+		Minor    int
+		Sub      string
+		SubInt   int
+		SubIsInt bool
+	}{
+		{"1.2.3", 1, 2, "3", 3, true},
+		{"", 0, 0, "", 0, false},
+		{"1.2.3a", 1, 2, "3a", 0, false},
+		{"13.12", 13, 12, "", 0, false},
+	}
+
+	for _, test := range tests {
+		if v := test.Input.Major(); v != test.Major {
+			t.Errorf("Major failed for '%s', expected %d, got %d", test.Input, test.Major, v)
+		}
+		if v := test.Input.Minor(); v != test.Minor {
+			t.Errorf("Minor failed for '%s', expected %d, got %d", test.Input, test.Minor, v)
+		}
+		if v := test.Input.Sub(); v != test.Sub {
+			t.Errorf("Sub failed for '%s', expected '%s', got '%s'", test.Input, test.Sub, v)
+		}
+		if v, vIsInt := test.Input.SubInt(); vIsInt != test.SubIsInt || v != test.SubInt {
+			t.Errorf("SubInt failed for '%s', expected (%d,%v), got (%d,%v)", test.Input, test.SubInt, test.SubIsInt, v, vIsInt)
+		}
+	}
+}
+
+// TestVersionCompareTo tests Version.CompareTo.
+func TestVersionCompareTo(t *testing.T) {
+	tests := []struct {
+		A      driver.Version
+		B      driver.Version
+		Result int
+	}{
+		{"1.2.3", "1.2.3", 0},
+		{"1.2", "1.2.3", -1},
+		{"1.2.3", "2.3.5", -1},
+		{"1.2", "1.1", 1},
+		{"1.2.3", "1.1.7", 1},
+		{"2.2", "1.2.a", 1},
+		{"1", "1.2.3", -1},
+		{"1.2.a", "1.2.3", 1},
+		{"1.2.3", "1.2.a", -1},
+		{"", "", 0},
+		{"1", "1", 0},
+		{"2.1", "2.1", 0},
+	}
+
+	for _, test := range tests {
+		if r := test.A.CompareTo(test.B); r != test.Result {
+			t.Errorf("CompareTo('%s', '%s') failed, expected %d, got %d", test.A, test.B, test.Result, r)
+		}
+	}
+}

version.go

@@ -0,0 +1,109 @@
+//
+// DISCLAIMER
+//
+// Copyright 2017 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Ewout Prangsma
+//
+
+package driver
+
+import (
+	"strconv"
+	"strings"
+)
+
+// Version holds a server version string. The string has the format "major.minor.sub".
+// Major and minor will be numeric, and sub may contain a number or a textual version.
+type Version string
+
+// Major returns the major part of the version
+// E.g. "3.1.7" -> 3
+func (v Version) Major() int {
+	parts := strings.Split(string(v), ".")
+	result, _ := strconv.Atoi(parts[0])
+	return result
+}
+
+// Minor returns the minor part of the version.
+// E.g. "3.1.7" -> 1
+func (v Version) Minor() int {
+	parts := strings.Split(string(v), ".")
+	if len(parts) >= 2 {
+		result, _ := strconv.Atoi(parts[1])
+		return result
+	}
+	return 0
+}
+
+// Sub returns the sub part of the version.
+// E.g. "3.1.7" -> "7"
+func (v Version) Sub() string {
+	parts := strings.SplitN(string(v), ".", 3)
+	if len(parts) == 3 {
+		return parts[2]
+	}
+	return ""
+}
+
+// SubInt returns the sub part of the version as integer.
+// The bool return value indicates if the sub part is indeed a number.
+// E.g. "3.1.7" -> 7, true
+// E.g. "3.1.foo" -> 0, false
+func (v Version) SubInt() (int, bool) {
+	result, err := strconv.Atoi(v.Sub())
+	return result, err == nil
+}
+
+// CompareTo returns an integer comparing two version.
+// The result will be 0 if v==other, -1 if v < other, and +1 if v > other.
+// If major & minor parts are equal and sub part is not a number,
+// the sub part will be compared using lexicographical string comparison.
+func (v Version) CompareTo(other Version) int {
+	a := v.Major()
+	b := other.Major()
+	if a < b {
+		return -1
+	}
+	if a > b {
+		return 1
+	}
+
+	a = v.Minor()
+	b = other.Minor()
+	if a < b {
+		return -1
+	}
+	if a > b {
+		return 1
+	}
+
+	a, aIsInt := v.SubInt()
+	b, bIsInt := other.SubInt()
+
+	if !aIsInt || !bIsInt {
+		// Do a string comparison
+		return strings.Compare(v.Sub(), other.Sub())
+	}
+	if a < b {
+		return -1
+	}
+	if a > b {
+		return 1
+	}
+	return 0
+}