Additional fixes for Heroku schema generation (#40)

* Generates only links with unique titles

* Always uses named types

* Avoids creating pointer types for required response attributes

gen.go

@@ -234,11 +234,29 @@ func (s *Schema) Values(name string, l *Link) []string {
 	} else if s.ReturnsCustomType(l) {
 		values = append(values, fmt.Sprintf("*%s", name), "error")
 	} else {
-		values = append(values, s.ReturnedGoType(l), "error")
+		values = append(values, name, "error")
 	}
 	return values
 }
 
+// UniqueLinks returns a list of links, unique by title.
+//
+// If more than one link in a given schema has the same title, only the one
+// appearing last will appear in this list. This matches the behavior of the
+// heroics Ruby gem and avoids generating structs and funcs with duplicate
+// names.
+func (s *Schema) UniqueLinks() []*Link {
+	titles := map[string]bool{}
+	var uniqueLinks []*Link
+	for _, link := range s.Links {
+		if _, ok := titles[link.Title]; !ok {
+			uniqueLinks = append(uniqueLinks, link)
+		}
+		titles[link.Title] = true
+	}
+	return uniqueLinks
+}
+
 // URL returns schema base URL.
 func (s *Schema) URL() string {
 	for _, l := range s.Links {
@@ -260,9 +278,9 @@ func (s *Schema) ReturnsCustomType(l *Link) bool {
 // ReturnedGoType returns Go type returned by the given link as a string.
 func (s *Schema) ReturnedGoType(l *Link) string {
 	if l.TargetSchema != nil {
-		return l.TargetSchema.goType(true, false)
+		return l.TargetSchema.goType(true, true)
 	}
-	return s.goType(true, false)
+	return s.goType(true, true)
 }
 
 // EmptyResult retursn true if the link result should be empty.

gen_test.go

@@ -456,7 +456,7 @@ var valuesTests = []struct {
 		Link: &Link{
 			Rel: "self",
 		},
-		Values: []string{"map[string]string", "error"},
+		Values: []string{"ConfigVar", "error"},
 	},
 	{
 		Schema: &Schema{},
@@ -500,6 +500,23 @@ var valuesTests = []struct {
 		},
 		Values: []string{"*ResultInfoResult", "error"},
 	},
+	{
+		Schema: &Schema{},
+		Name:   "ConfigVar",
+		Link: &Link{
+			Rel:   "self",
+			Title: "Info",
+			TargetSchema: &Schema{
+				Type: "object",
+				Properties: map[string]*Schema{
+					"value": {
+						Type: "integer",
+					},
+				},
+			},
+		},
+		Values: []string{"*ConfigVarInfoResult", "error"},
+	},
 	{
 		Schema: &Schema{
 			Type:                 "object",
@@ -535,7 +552,7 @@ var valuesTests = []struct {
 				Type: "string",
 			},
 		},
-		Values: []string{"string", "error"},
+		Values: []string{"ResultListResult", "error"},
 	},
 	{
 		Schema: &Schema{},
@@ -547,7 +564,7 @@ var valuesTests = []struct {
 				Type: []interface{}{"string", "null"},
 			},
 		},
-		Values: []string{"*string", "error"},
+		Values: []string{"ResultListResult", "error"},
 	},
 	{
 		Schema: &Schema{
@@ -567,7 +584,7 @@ var valuesTests = []struct {
 				Type: "string",
 			},
 		},
-		Values: []string{"string", "error"},
+		Values: []string{"ResultInfoResult", "error"},
 	},
 	{
 		Schema: &Schema{
@@ -587,7 +604,7 @@ var valuesTests = []struct {
 				Type: "string",
 			},
 		},
-		Values: []string{"string", "error"},
+		Values: []string{"ConfigVarInfoResult", "error"},
 	},
 }
 

helpers.go

@@ -202,5 +202,5 @@ func paramType(name string, l *Link) string {
 }
 
 func defineCustomType(s *Schema, l *Link) bool {
-	return l.TargetSchema != nil && s.ReturnsCustomType(l)
+	return l.TargetSchema != nil
 }

templates/funcs.tmpl

@@ -1,6 +1,6 @@
 {{$Name := .Name}}
 {{$Def := .Definition}}
-{{range .Definition.Links}}
+{{range .Definition.UniqueLinks}}
   {{if .AcceptsCustomType}}
    type {{paramType $Name .}} {{linkGoType .}}
   {{end}}

templates/templates.go

@@ -6,7 +6,7 @@ var templates = map[string]string{"field.tmpl": `{{initialCap .Name}} {{.Type}}
 `,
 	"funcs.tmpl": `{{$Name := .Name}}
 {{$Def := .Definition}}
-{{range .Definition.Links}}
+{{range .Definition.UniqueLinks}}
   {{if .AcceptsCustomType}}
    type {{paramType $Name .}} {{linkGoType .}}
   {{end}}