sync validators with the client spec and server

FeatureBaseDB · May 24, 2017 · 5a6275c · 5a6275c
1 parent 37aa539
commit 5a6275c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,9 @@ Go client for Pilosa high performance distributed bitmap index.
 
 ## Change Log
 
+* **v0.3.2**:
+    * Updated the accepted values for index, frame names and labels to match with the Pilosa server.
+
 * **v0.3.1** (2017-05-01):
     * Initial version
     * Supports Pilosa Server v0.3.1

diff --git a/validate.go b/validate.go
@@ -42,9 +42,9 @@ const (
 	maxLabel     = 64
 )
 
-var indexNameRegex = regexp.MustCompile("^[a-z0-9_-]+$")
-var frameNameRegex = regexp.MustCompile("^[a-z0-9][.a-z0-9_-]*$")
-var labelRegex = regexp.MustCompile("^[a-zA-Z][a-zA-Z0-9_]*$")
+var indexNameRegex = regexp.MustCompile("^[a-z][a-z0-9_-]*$")
+var frameNameRegex = regexp.MustCompile("^[a-z][a-z0-9_-]*$")
+var labelRegex = regexp.MustCompile("^[a-zA-Z][a-zA-Z0-9_-]*$")
 
 // ValidIndexName returns true if the given index name is valid, otherwise false.
 func ValidIndexName(name string) bool {

diff --git a/validate_test.go b/validate_test.go
@@ -36,7 +36,7 @@ import "testing"
 
 func TestValidateIndexName(t *testing.T) {
 	names := []string{
-		"a", "ab", "ab1", "1", "_", "-", "b-c", "d_e",
+		"a", "ab", "ab1", "b-c", "d_e",
 		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
 	}
 	for _, name := range names {
@@ -48,7 +48,7 @@ func TestValidateIndexName(t *testing.T) {
 
 func TestValidateIndexNameInvalid(t *testing.T) {
 	names := []string{
-		"", "'", "^", "/", "\\", "A", "*", "a:b", "valid?no", "yüce",
+		"", "'", "^", "/", "\\", "A", "*", "a:b", "valid?no", "yüce", "1", "_", "-",
 		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1",
 	}
 	for _, name := range names {
@@ -60,7 +60,7 @@ func TestValidateIndexNameInvalid(t *testing.T) {
 
 func TestValidateFrameName(t *testing.T) {
 	names := []string{
-		"a", "ab", "ab1", "b-c", "d_e", "d.e", "1",
+		"a", "ab", "ab1", "b-c", "d_e",
 		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
 	}
 	for _, name := range names {
@@ -72,7 +72,7 @@ func TestValidateFrameName(t *testing.T) {
 
 func TestValidateFrameNameInvalid(t *testing.T) {
 	names := []string{
-		"", "'", "^", "/", "\\", "A", "*", "a:b", "valid?no", "yüce", "_", "-", ".data",
+		"", "'", "^", "/", "\\", "A", "*", "a:b", "valid?no", "yüce", "_", "-", ".data", "d.e", "1",
 		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1",
 	}
 	for _, name := range names {
@@ -85,7 +85,7 @@ func TestValidateFrameNameInvalid(t *testing.T) {
 
 func TestValidateLabel(t *testing.T) {
 	labels := []string{
-		"a", "ab", "ab1", "d_e", "A", "Bc", "B1", "aB",
+		"a", "ab", "ab1", "d_e", "A", "Bc", "B1", "aB", "b-c",
 		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
 	}
 	for _, label := range labels {
@@ -97,7 +97,7 @@ func TestValidateLabel(t *testing.T) {
 
 func TestValidateLabelInvalid(t *testing.T) {
 	labels := []string{
-		"", "1", "_", "-", "b-c", "'", "^", "/", "\\", "*", "a:b", "valid?no", "yüce",
+		"", "1", "_", "-", "'", "^", "/", "\\", "*", "a:b", "valid?no", "yüce",
 		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1",
 	}
 	for _, label := range labels {