Added default api version 0

Author: romanoff

parse_test.go

@@ -21,10 +21,10 @@ func TestParseRoutes(t *testing.T) {
 	if api.Routes[0].Collection != true {
 		t.Errorf("Expected to get path collection to be true, but got false")
 	}
-	if api.Routes[0].Schema != nil {
+	if api.Routes[0].Versions[0].Schema != nil {
 		t.Errorf("Expected to get no route schema, but got")
 	}
-	if api.Routes[1].Schema == nil {
+	if api.Routes[1].Versions[0].Schema == nil {
 		t.Errorf("Expected to get route schema, but got nil")
 	}
 	if api.Version != 5 {

parser.go

@@ -107,7 +107,7 @@ func ParseApiSettings(api *Api, line []byte) (bool, error) {
 }
 
 func ParseRoute(line []byte) (*Route, error) {
-	route := &Route{}
+	route := &Route{Versions: make(map[int]*RouteVersion)}
 	chunks := bytes.Split(line, []byte(","))
 	urlParams := bytes.Split(chunks[0], []byte(" "))
 	route.Method = strings.ToUpper(string(urlParams[0]))
@@ -146,7 +146,10 @@ func ParseSchema(path string, route *Route) error {
 	if err != nil {
 		return err
 	}
-	route.Schema = schema
+	if route.Versions[0] == nil {
+		route.Versions[0] = &RouteVersion{Version: 0}
+	}
+	route.Versions[0].Schema = schema
 	return nil
 }
 
@@ -159,7 +162,10 @@ func ParseSqlTemplate(path string, route *Route) error {
 	if err != nil {
 		return err
 	}
-	route.SqlTemplate = tmpl
+	if route.Versions[0] == nil {
+		route.Versions[0] = &RouteVersion{Version: 0}
+	}
+	route.Versions[0].SqlTemplate = tmpl
 	return nil
 }
 

route.go

@@ -11,13 +11,12 @@ import (
 )
 
 type Route struct {
-	Name        string
-	Method      string
-	Path        string
-	Collection  bool
-	Custom      bool
-	Schema      *gojsonschema.Schema
-	SqlTemplate *template.Template
+	Name       string
+	Method     string
+	Path       string
+	Collection bool
+	Custom     bool
+	Versions   map[int]*RouteVersion
 }
 
 type RouteVersion struct {
@@ -27,11 +26,15 @@ type RouteVersion struct {
 }
 
 func (self *Route) validate(params map[string]interface{}, version int) (string, error) {
-	if self.Schema == nil {
+	route := self.Versions[version]
+	if route == nil {
+		return "", fmt.Errorf("Route version %v missing from %v route", version, self.Name)
+	}
+	if route.Schema == nil {
 		return "", nil
 	}
 	documentLoader := gojsonschema.NewGoLoader(params)
-	result, err := self.Schema.Validate(documentLoader)
+	result, err := route.Schema.Validate(documentLoader)
 	if err != nil {
 		return "", err
 	}
@@ -50,6 +53,10 @@ func (self *Route) validate(params map[string]interface{}, version int) (string,
 }
 
 func (self *Route) Sql(params map[string]interface{}, version int) (string, error) {
+	route := self.Versions[version]
+	if route == nil {
+		return "", fmt.Errorf("Route version %v missing from %v route", version, self.Name)
+	}
 	var out bytes.Buffer
 	response, err := self.validate(params, version)
 	if err != nil {
@@ -61,7 +68,7 @@ func (self *Route) Sql(params map[string]interface{}, version int) (string, erro
 	if !self.Custom {
 		out.Write([]byte("with response_table as ("))
 	}
-	err = self.SqlTemplate.Execute(&out, params)
+	err = route.SqlTemplate.Execute(&out, params)
 	if err != nil {
 		return "", err
 	}

route_test.go

@@ -29,8 +29,13 @@ func TestRouteSql(t *testing.T) {
 		t.Errorf("Expected not to get error, but got: %v", err)
 	}
 	route := &Route{
-		SqlTemplate: tmpl,
-		Schema:      schema,
+		Versions: map[int]*RouteVersion{
+			0: {
+				Version:     0,
+				SqlTemplate: tmpl,
+				Schema:      schema,
+			},
+		},
 	}
 	params := make(map[string]interface{})
 	params["id"] = 23