fix cursor, support ?specversion as a capability, add tests

Signed-off-by: Doug Davis <[email protected]>

registry/capabilities.go

@@ -21,7 +21,7 @@ type Capabilities struct {
 var AllowableFlags = ArrayToLower([]string{
 	"epoch", "export", "filter", "inline",
 	"nested", "nodefaultversionid", "nodefaultversionsticky",
-	"noepoch", "noreadonly", "schema", "setdefaultversionid"})
+	"noepoch", "noreadonly", "schema", "setdefaultversionid", "specversion"})
 
 var AllowableMutable = ArrayToLower([]string{
 	"capabilities", "entities", "model"})
@@ -135,10 +135,10 @@ func (c *Capabilities) Validate() error {
 		return err
 	}
 
-	if !ArrayContains(c.Schemas, strings.ToLower(XREGSCHEMA+"/"+SPECVERSION)) {
+	if !ArrayContainsAnyCase(c.Schemas, XREGSCHEMA+"/"+SPECVERSION) {
 		return fmt.Errorf(`"schemas" must contain %q`, XREGSCHEMA+"/"+SPECVERSION)
 	}
-	if !ArrayContains(c.SpecVersions, strings.ToLower(SPECVERSION)) {
+	if !ArrayContainsAnyCase(c.SpecVersions, SPECVERSION) {
 		return fmt.Errorf(`"specversions" must contain %q`, SPECVERSION)
 	}
 
@@ -160,25 +160,25 @@ func ParseCapabilitiesJSON(buf []byte) (*Capabilities, error) {
 }
 
 func (c *Capabilities) FlagEnabled(str string) bool {
-	return ArrayContains(c.Flags, strings.ToLower(str))
+	return ArrayContainsAnyCase(c.Flags, str)
 }
 
 func (c *Capabilities) MutableEnabled(str string) bool {
-	return ArrayContains(c.Mutable, strings.ToLower(str))
+	return ArrayContainsAnyCase(c.Mutable, str)
 }
 
 func (c *Capabilities) PaginationEnabled() bool {
 	return c.Pagination
 }
 
 func (c *Capabilities) SchemaEnabled(str string) bool {
-	return ArrayContains(c.Schemas, strings.ToLower(str))
+	return ArrayContainsAnyCase(c.Schemas, str)
 }
 
 func (c *Capabilities) ShortSelfEnabled(str string) bool {
 	return c.ShortSelf
 }
 
 func (c *Capabilities) SpecVersionEnabled(str string) bool {
-	return ArrayContains(c.SpecVersions, strings.ToLower(str))
+	return ArrayContainsAnyCase(c.SpecVersions, str)
 }

registry/httpStuff.go

@@ -136,6 +136,15 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			"the model \"hasdocument\" value set to \"false\" is invalid")
 	}
 
+	if err == nil {
+		if sv := info.GetFlag("specversion"); sv != "" {
+			if !info.Registry.Capabilities.SpecVersionEnabled(sv) {
+				err = fmt.Errorf("Unsupported xRegistry spec version: %s",
+					sv)
+			}
+		}
+	}
+
 	if err == nil {
 		// These should only return an error if they didn't already
 		// send a response back to the client.
@@ -565,6 +574,7 @@ func (pw *PageWriter) Done() {
   }
 
   .expandBtn {
+    cursor: default ;
     display: inline-block ;
 	width: 2ch ;
 	text-align: center ;

registry/utils.go

@@ -869,6 +869,16 @@ func ArrayContains(strs []string, needle string) bool {
 	return false
 }
 
+func ArrayContainsAnyCase(strs []string, needle string) bool {
+	needle = strings.ToLower(needle)
+	for _, s := range strs {
+		if needle == strings.ToLower(s) {
+			return true
+		}
+	}
+	return false
+}
+
 // Convert a string into a unique MD5 string - basically just for cases
 // where we want to create a tiny URL
 func MD5(str string) string {

tests/capabilities_test.go

@@ -25,7 +25,8 @@ func TestCapabilitySimple(t *testing.T) {
     "noepoch",
     "noreadonly",
     "schema",
-    "setdefaultversionid"
+    "setdefaultversionid",
+    "specversion"
   ],
   "mutable": [
     "capabilities",
@@ -64,7 +65,8 @@ func TestCapabilitySimple(t *testing.T) {
       "noepoch",
       "noreadonly",
       "schema",
-      "setdefaultversionid"
+      "setdefaultversionid",
+      "specversion"
     ],
     "mutable": [
       "capabilities",
@@ -256,7 +258,8 @@ func TestCapabilityPath(t *testing.T) {
     "noepoch",
     "noreadonly",
     "schema",
-    "setdefaultversionid"
+    "setdefaultversionid",
+    "specversion"
   ],
   "mutable": [
     "capabilities",
@@ -370,7 +373,7 @@ func TestCapabilityPath(t *testing.T) {
   "flags": [
     "epoch", "export", "filter", "inline", "nested", "nodefaultversionid",
     "nodefaultversionsticky", "noepoch", "noreadonly", "schema",
-	"setdefaultversionid"
+	"setdefaultversionid", "specversion"
   ],
   "mutable": [ "capabilities", "entities", "model" ],
   "pagination": false,
@@ -390,7 +393,8 @@ func TestCapabilityPath(t *testing.T) {
     "noepoch",
     "noreadonly",
     "schema",
-    "setdefaultversionid"
+    "setdefaultversionid",
+    "specversion"
   ],
   "mutable": [
     "capabilities",
@@ -420,7 +424,8 @@ func TestCapabilityPath(t *testing.T) {
     "noepoch",
     "noreadonly",
     "schema",
-    "setdefaultversionid"
+    "setdefaultversionid",
+    "specversion"
   ],
   "mutable": [
     "capabilities",
@@ -617,7 +622,7 @@ func TestCapabilityAttr(t *testing.T) {
   "flags": [
     "epoch", "export", "filter", "inline", "nested", "nodefaultversionid",
     "nodefaultversionsticky", "noepoch", "noreadonly", "schema",
-	"setdefaultversionid"
+	"setdefaultversionid", "specversion"
   ],
   "mutable": [ "capabilities", "entities", "model" ],
   "pagination": false,
@@ -648,7 +653,8 @@ func TestCapabilityAttr(t *testing.T) {
     "noepoch",
     "noreadonly",
     "schema",
-    "setdefaultversionid"
+    "setdefaultversionid",
+    "specversion"
   ],
   "mutable": [
     "capabilities",
@@ -735,9 +741,9 @@ func TestCapabilityAttr(t *testing.T) {
 
 // "epoch", "export", "filter", "inline",
 // "nested", "nodefaultversionid", "nodefaultversionsticky",
-// "noepoch", "noreadonly", "schema", "setdefaultversionid"})
+// "noepoch", "noreadonly", "schema", "setdefaultversionid", "specversion"})
 
-func TestCapabilityFlags(t *testing.T) {
+func TestCapabilityFlagsOff(t *testing.T) {
 	reg := NewRegistry("TestCapabilityFlags")
 	defer PassDeleteReg(t, reg)
 
@@ -825,5 +831,8 @@ func TestCapabilityFlags(t *testing.T) {
 	// Test ?schema
 	xHTTP(t, reg, "GET", "/model?schema=foo", ``, 200, `*`)
 
+	// Test ?specversion
+	xHTTP(t, reg, "GET", "/model?specversion=foo", ``, 200, `*`)
+
 	// TODO nodefaultversionid, nodefaultversionsticky, noepoch, noreadonly
 }

tests/http_test.go

@@ -14727,3 +14727,12 @@ func TestHTTPInvalidID(t *testing.T) {
 		`{"fileid": "f1*"}`, 400,
 		"\"f1*\" isn't a valid ID\n")
 }
+
+func TestHTTPSpecVersion(t *testing.T) {
+	reg := NewRegistry("TestHTTPSpecVersion")
+	defer PassDeleteReg(t, reg)
+
+	xHTTP(t, reg, "GET", "?specversion=0.5", "", 200, "*")
+	xHTTP(t, reg, "GET", "?specversion=0.x", "", 400,
+		"Unsupported xRegistry spec version: 0.x\n")
+}