Resource generator fixes #328

Dockerfile

@@ -38,20 +38,20 @@ RUN buffalo test -race
 RUN buffalo g goth facebook twitter linkedin github
 RUN filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/goth.json
 
-RUN buffalo g resource users name:text email:text
-RUN filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/resource_model_migration.json
-
-RUN rm models/user_test.go
-RUN rm models/user.go
-RUN rm actions/users_test.go
-
 RUN buffalo g resource admins --skip-model
 RUN filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/resource_skip_model.json
 RUN rm actions/admins_test.go
 
 RUN buffalo test -race
 RUN buffalo build
 
+RUN buffalo g resource users name:text email:text
+RUN filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/resource_model_migration.json
+
+RUN rm models/user_test.go
+RUN rm models/user.go
+RUN rm actions/users_test.go
+
 WORKDIR $GOPATH/src
 RUN buffalo new --skip-pop simple_world
 WORKDIR ./simple_world

buffalo/cmd/generate.go

@@ -19,6 +19,7 @@ func init() {
 
 	generate.ResourceCmd.Flags().BoolVarP(&generate.SkipResourceMigration, "skip-migration", "s", false, "sets resource generator not-to add model migration")
 	generate.ResourceCmd.Flags().BoolVarP(&generate.SkipResourceModel, "skip-model", "", false, "makes resource generator not to generate model nor migrations")
+	generate.ResourceCmd.Flags().StringVarP(&generate.UseResourceModel, "use-model", "u", "", "generates crud options for a model")
 
 	RootCmd.AddCommand(generateCmd)
 }

buffalo/cmd/generate/resource.go

@@ -2,6 +2,7 @@ package generate
 
 import (
 	"errors"
+	"strings"
 
 	"github.com/gobuffalo/buffalo/generators/resource"
 	"github.com/gobuffalo/makr"
@@ -30,46 +31,110 @@ Generates:
 $ buffalo g resource users --skip-model
 Generates:
 
+- actions/users.go
+- actions/users_test.go
+
+$ buffalo g resource users --use-model
+Generates:
+
 - actions/users.go
 - actions/users_test.go`
 
-//SkipResourceMigration allows to generate a resource without the migration.
+// SkipResourceMigration allows to generate a resource without the migration.
 var SkipResourceMigration = false
 
-//SkipResourceModel allows to generate a resource without the model and Migration.
+// SkipResourceModel allows to generate a resource without the model and Migration.
 var SkipResourceModel = false
 
+// UseResourceModel allows to generate a resource with a working model.
+var UseResourceModel = ""
+
 // ResourceCmd generates a new actions/resource file and a stub test.
 var ResourceCmd = &cobra.Command{
 	Use:     "resource [name]",
 	Example: resourceExamples,
 	Aliases: []string{"r"},
 	Short:   "Generates a new actions/resource file",
 	RunE: func(cmd *cobra.Command, args []string) error {
+		var name, modelName string
+
+		// Allow overwriting modelName with the --use-model flag
+		// buffalo generate resource users --use-model people
+		if UseResourceModel != "" {
+			modelName = inflect.Pluralize(UseResourceModel)
+		}
+
 		if len(args) == 0 {
-			return errors.New("you must specify a resource name")
+			if UseResourceModel == "" {
+				return errors.New("you must specify a resource name")
+			}
+			// When there is no resource name given and --use-model flag is set
+			name = UseResourceModel
+		} else {
+			// When resource name is specified
+			name = inflect.Pluralize(args[0])
+			// If there is no --use-model flag set use the resource to create the model
+			if modelName == "" {
+				modelName = name
+			}
 		}
+		modelProps := getModelPropertiesFromArgs(args)
 
-		name := args[0]
 		data := makr.Data{
-			"name":         name,
-			"singular":     inflect.Singularize(name),
-			"plural":       inflect.Pluralize(name),
-			"camel":        inflect.Camelize(name),
-			"under":        inflect.Underscore(name),
-			"downFirstCap": inflect.CamelizeDownFirst(name),
-			"actions":      []string{"List", "Show", "New", "Create", "Edit", "Update", "Destroy"},
-			"args":         args,
+			"name":             name,
+			"singular":         inflect.Singularize(name),
+			"plural":           name,
+			"camel":            inflect.Camelize(name),
+			"under":            inflect.Underscore(name),
+			"underSingular":    inflect.Singularize(inflect.Underscore(name)),
+			"downFirstCap":     inflect.CamelizeDownFirst(name),
+			"model":            inflect.Singularize(inflect.Camelize(modelName)),
+			"modelPlural":      inflect.Camelize(modelName),
+			"modelUnder":       inflect.Singularize(inflect.Underscore(modelName)),
+			"modelPluralUnder": inflect.Underscore(modelName),
+			"varPlural":        inflect.CamelizeDownFirst(modelName),
+			"varSingular":      inflect.Singularize(inflect.CamelizeDownFirst(modelName)),
+			"actions":          []string{"List", "Show", "New", "Create", "Edit", "Update", "Destroy"},
+			"args":             args,
+			"modelProps":       modelProps,
 
 			// Flags
 			"skipMigration": SkipResourceMigration,
 			"skipModel":     SkipResourceModel,
+			"useModel":      UseResourceModel,
 		}
-
 		g, err := resource.New(data)
 		if err != nil {
 			return err
 		}
 		return g.Run(".", data)
 	},
 }
+
+type modelProp struct {
+	Name string
+	Type string
+}
+
+func (m modelProp) String() string {
+	return m.Name
+}
+
+func getModelPropertiesFromArgs(args []string) []modelProp {
+	var mProps []modelProp
+	if len(args) == 0 {
+		return mProps
+	}
+	for _, a := range args[1:] {
+		ax := strings.Split(a, ":")
+		p := modelProp{
+			Name: inflect.Camelize(ax[0]),
+			Type: "string",
+		}
+		if len(ax) > 1 {
+			p.Type = strings.ToLower(strings.TrimPrefix(ax[1], "nulls."))
+		}
+		mProps = append(mProps, p)
+	}
+	return mProps
+}

buffalo/cmd/generate/resource_test.go

@@ -32,7 +32,8 @@ func TestGenerateResourceCode(t *testing.T) {
 	SkipResourceMigration = false
 	SkipResourceModel = false
 
-	e = ResourceCmd.RunE(&cmd, []string{"users"})
+	// Testing generator with singular definition
+	e = ResourceCmd.RunE(&cmd, []string{"user"})
 	r.Nil(e)
 
 	fileData, _ := ioutil.ReadFile("actions/app.go")
@@ -50,4 +51,23 @@ func TestGenerateResourceCode(t *testing.T) {
 	r.Contains(string(fileData), "func (as *ActionSuite) Test_UsersResource_Show")
 	r.Contains(string(fileData), "func (as *ActionSuite) Test_UsersResource_Create")
 
+	// Testing generator with plural definition
+	e = ResourceCmd.RunE(&cmd, []string{"comments"})
+	r.Nil(e)
+
+	fileData, _ = ioutil.ReadFile("actions/app.go")
+	r.Contains(string(fileData), "var commentsResource buffalo.Resource")
+	r.Contains(string(fileData), "commentsResource = CommentsResource{&buffalo.BaseResource{}}")
+	r.Contains(string(fileData), "app.Resource(\"/comments\", commentsResource)")
+
+	fileData, _ = ioutil.ReadFile("actions/comments.go")
+	r.Contains(string(fileData), "type CommentsResource struct {")
+	r.Contains(string(fileData), "func (v CommentsResource) List(c buffalo.Context) error {")
+	r.Contains(string(fileData), "func (v CommentsResource) Destroy(c buffalo.Context) error {")
+
+	fileData, _ = ioutil.ReadFile("actions/comments_test.go")
+	r.Contains(string(fileData), "func (as *ActionSuite) Test_CommentsResource_List")
+	r.Contains(string(fileData), "func (as *ActionSuite) Test_CommentsResource_Show")
+	r.Contains(string(fileData), "func (as *ActionSuite) Test_CommentsResource_Create")
+
 }

generators/resource/resource.go

@@ -3,6 +3,7 @@ package resource
 import (
 	"fmt"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/gobuffalo/buffalo/generators"
@@ -17,8 +18,29 @@ func New(data makr.Data) (*makr.Generator, error) {
 	if err != nil {
 		return nil, err
 	}
+	// Get the flags
+	useModel := data["useModel"].(string)
+	skipModel := data["skipModel"].(bool)
+
+	tmplName := "resource-use_model"
+
+	if skipModel == true {
+		tmplName = "resource-name"
+	}
 	for _, f := range files {
-		g.Add(makr.NewFile(strings.Replace(f.WritePath, "resource-name", data["under"].(string), -1), f.Body))
+		// Adding the resource template to the generator
+		if strings.Contains(f.WritePath, tmplName) {
+			g.Add(makr.NewFile(strings.Replace(f.WritePath, tmplName, data["under"].(string), -1), f.Body))
+		}
+		// Adding the html templates to the generator
+		if strings.Contains(f.WritePath, "model-view-") {
+			targetPath := filepath.Join(
+				filepath.Dir(f.WritePath),
+				data["modelPluralUnder"].(string),
+				strings.Replace(filepath.Base(f.WritePath), "model-view-", "", -1),
+			)
+			g.Add(makr.NewFile(targetPath, f.Body))
+		}
 	}
 	g.Add(&makr.Func{
 		Should: func(data makr.Data) bool { return true },
@@ -29,8 +51,7 @@ func New(data makr.Data) (*makr.Generator, error) {
 			)
 		},
 	})
-
-	if skipModel := data["skipModel"].(bool); skipModel == false {
+	if skipModel == false && useModel == "" {
 		g.Add(modelCommand(data))
 	}
 

generators/resource/templates/actions/resource-name.go.tmpl

@@ -12,4 +12,4 @@ func (v {{$.camel}}Resource) {{$a}}(c buffalo.Context) error {
 	return c.Render(200, r.String("{{$.camel}}#{{$a}}"))
 }
 
-{{end}}
+{{end}}