Merge pull request #1514 from ptman/lint

Fix misspellings and some lint errors

before_after_filter.go

@@ -31,7 +31,6 @@ func BeforeAfterFilter(c *Controller, fc []Filter) {
 }
 
 func beforeAfterFilterInvoke(method When, c *Controller) (r *reflect.Value) {
-
 	if c.Type == nil {
 		return
 	}

binder_test.go

@@ -7,7 +7,6 @@ package revel
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/revel/config"
 	"io"
 	"io/ioutil"
 	"os"
@@ -16,6 +15,8 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/revel/config"
 )
 
 type A struct {
@@ -250,7 +251,6 @@ func TestBinder(t *testing.T) {
 	}
 
 	for k, fhs := range expectedBoundFiles {
-
 		if len(fhs) == 1 {
 			// Test binding single files to: *os.File, []byte, io.Reader, io.ReadSeeker
 			for _, binding := range fileBindings {
@@ -263,7 +263,6 @@ func TestBinder(t *testing.T) {
 				returns := reflect.ValueOf(binding.f).Call([]reflect.Value{actual})
 				valEq(t, k, returns[0], reflect.ValueOf(fhs[0].content))
 			}
-
 		} else {
 			// Test binding multi to:
 			// []*os.File, [][]byte, []io.Reader, []io.ReadSeeker

cache/cache.go

@@ -137,9 +137,11 @@ func Flush() error                                                { return Insta
 func Set(key string, value interface{}, expires time.Duration) error {
 	return Instance.Set(key, value, expires)
 }
+
 func Add(key string, value interface{}, expires time.Duration) error {
 	return Instance.Add(key, value, expires)
 }
+
 func Replace(key string, value interface{}, expires time.Duration) error {
 	return Instance.Replace(key, value, expires)
 }

cache/inmemory.go

@@ -7,10 +7,10 @@ package cache
 import (
 	"fmt"
 	"reflect"
+	"sync"
 	"time"
 
 	"github.com/patrickmn/go-cache"
-	"sync"
 )
 
 type InMemoryCache struct {

cache/memcached.go

@@ -72,7 +72,6 @@ func (c MemcachedCache) Flush() error {
 
 func (c MemcachedCache) invoke(f func(*memcache.Client, *memcache.Item) error,
 	key string, value interface{}, expires time.Duration) error {
-
 	switch expires {
 	case DefaultExpiryTime:
 		expires = c.defaultExpiration

cache/redis.go

@@ -20,7 +20,7 @@ type RedisCache struct {
 // NewRedisCache returns a new RedisCache with given parameters
 // until redigo supports sharding/clustering, only one host will be in hostList
 func NewRedisCache(host string, password string, defaultExpiration time.Duration) RedisCache {
-	var pool = &redis.Pool{
+	pool := &redis.Pool{
 		MaxIdle:     revel.Config.IntDefault("cache.redis.maxidle", 5),
 		MaxActive:   revel.Config.IntDefault("cache.redis.maxactive", 0),
 		IdleTimeout: time.Duration(revel.Config.IntDefault("cache.redis.idletimeout", 240)) * time.Second,
@@ -237,7 +237,6 @@ func (c RedisCache) Flush() error {
 
 func (c RedisCache) invoke(f func(string, ...interface{}) (interface{}, error),
 	key string, value interface{}, expires time.Duration) error {
-
 	switch expires {
 	case DefaultExpiryTime:
 		expires = c.defaultExpiration

compress.go

@@ -36,22 +36,22 @@ var compressLog = RevelLog.New("section", "compress")
 
 // WriteFlusher interface for compress writer
 type WriteFlusher interface {
-	io.Writer // An IO Writer
-	io.Closer // A closure
+	io.Writer     // An IO Writer
+	io.Closer     // A closure
 	Flush() error /// A flush function
 }
 
 // The compressed writer
 type CompressResponseWriter struct {
 	Header             *BufferedServerHeader // The header
-	ControllerResponse *Response // The response
-	OriginalWriter     io.Writer // The writer
-	compressWriter     WriteFlusher // The flushed writer
-	compressionType    string // The compression type
-	headersWritten     bool // True if written
-	closeNotify        chan bool // The notify channel to close
-	parentNotify       <-chan bool // The parent chanel to receive the closed event
-	closed             bool // True if closed
+	ControllerResponse *Response             // The response
+	OriginalWriter     io.Writer             // The writer
+	compressWriter     WriteFlusher          // The flushed writer
+	compressionType    string                // The compression type
+	headersWritten     bool                  // True if written
+	closeNotify        chan bool             // The notify channel to close
+	parentNotify       <-chan bool           // The parent chanel to receive the closed event
+	closed             bool                  // True if closed
 }
 
 // CompressFilter does compression of response body in gzip/deflate if
@@ -276,11 +276,11 @@ func detectCompressionType(req *Request, resp *Response) (found bool, compressio
 // BufferedServerHeader will not send content out until the Released is called, from that point on it will act normally
 // It implements all the ServerHeader
 type BufferedServerHeader struct {
-	cookieList []string // The cookie list
+	cookieList []string            // The cookie list
 	headerMap  map[string][]string // The header map
-	status     int // The status
-	released   bool // True if released
-	original   ServerHeader // The original header
+	status     int                 // The status
+	released   bool                // True if released
+	original   ServerHeader        // The original header
 }
 
 // Creates a new instance based on the ServerHeader
@@ -355,14 +355,14 @@ func (bsh *BufferedServerHeader) GetKeys() (value []string) {
 		value = bsh.original.GetKeys()
 		for key := range bsh.headerMap {
 			found := false
-			for _,v := range value {
-				if v==key {
+			for _, v := range value {
+				if v == key {
 					found = true
 					break
 				}
 			}
 			if !found {
-				value = append(value,key)
+				value = append(value, key)
 			}
 		}
 	}

controller.go

@@ -24,30 +24,32 @@ import (
 // Controller Revel's controller structure that gets embedded in user defined
 // controllers
 type Controller struct {
-	Name          string                 // The controller name, e.g. "Application"
-	Type          *ControllerType        // A description of the controller type.
-	MethodName    string                 // The method name, e.g. "Index"
-	MethodType    *MethodType            // A description of the invoked action type.
-	AppController interface{}            // The controller that was instantiated. embeds revel.Controller
-	Action        string                 // The fully qualified action name, e.g. "App.Index"
-	ClientIP      string                 // holds IP address of request came from
-
-	Request       *Request
-	Response      *Response
-	Result        Result
-
-	Flash         Flash                  // User cookie, cleared after 1 request.
-	Session       session.Session        // Session, stored using the session engine specified
-	Params        *Params                // Parameters from URL and form (including multipart).
-	Args          map[string]interface{} // Per-request scratch space.
-	ViewArgs      map[string]interface{} // Variables passed to the template.
-	Validation    *Validation            // Data validation helpers
-	Log           logger.MultiLogger     // Context Logger
+	Name          string          // The controller name, e.g. "Application"
+	Type          *ControllerType // A description of the controller type.
+	MethodName    string          // The method name, e.g. "Index"
+	MethodType    *MethodType     // A description of the invoked action type.
+	AppController interface{}     // The controller that was instantiated. embeds revel.Controller
+	Action        string          // The fully qualified action name, e.g. "App.Index"
+	ClientIP      string          // holds IP address of request came from
+
+	Request  *Request
+	Response *Response
+	Result   Result
+
+	Flash      Flash                  // User cookie, cleared after 1 request.
+	Session    session.Session        // Session, stored using the session engine specified
+	Params     *Params                // Parameters from URL and form (including multipart).
+	Args       map[string]interface{} // Per-request scratch space.
+	ViewArgs   map[string]interface{} // Variables passed to the template.
+	Validation *Validation            // Data validation helpers
+	Log        logger.MultiLogger     // Context Logger
 }
 
 // The map of controllers, controllers are mapped by using the namespace|controller_name as the key
-var controllers = make(map[string]*ControllerType)
-var controllerLog = RevelLog.New("section", "controller")
+var (
+	controllers   = make(map[string]*ControllerType)
+	controllerLog = RevelLog.New("section", "controller")
+)
 
 // NewController returns new controller instance for Request and Response
 func NewControllerEmpty() *Controller {
@@ -63,7 +65,6 @@ func NewController(context ServerContext) *Controller {
 
 // Sets the request and the response for the controller
 func (c *Controller) SetController(context ServerContext) {
-
 	c.Request.SetRequest(context.GetRequest())
 	c.Response.SetResponse(context.GetResponse())
 	c.Request.controller = c
@@ -73,8 +74,8 @@ func (c *Controller) SetController(context ServerContext) {
 		"RunMode": RunMode,
 		"DevMode": DevMode,
 	}
-
 }
+
 func (c *Controller) Destroy() {
 	// When the instantiated controller gets injected
 	// It inherits this method, so we need to
@@ -312,7 +313,7 @@ func (c *Controller) RenderFile(file *os.File, delivery ContentDisposition) Resu
 	c.setStatusIfNil(http.StatusOK)
 
 	var (
-		modtime = time.Now()
+		modtime       = time.Now()
 		fileInfo, err = file.Stat()
 	)
 	if err != nil {
@@ -364,7 +365,7 @@ func (c *Controller) Stats() map[string]interface{} {
 	if RevelConfig.Controller.Reuse {
 		result["revel-controllers"] = RevelConfig.Controller.Stack.String()
 		for key, appStack := range RevelConfig.Controller.CachedMap {
-			result["app-" + key] = appStack.String()
+			result["app-"+key] = appStack.String()
 		}
 	}
 	return result
@@ -381,13 +382,11 @@ func (c *Controller) Message(message string, args ...interface{}) string {
 // SetAction sets the action that is being invoked in the current request.
 // It sets the following properties: Name, Action, Type, MethodType
 func (c *Controller) SetAction(controllerName, methodName string) error {
-
 	return c.SetTypeAction(controllerName, methodName, nil)
 }
 
 // SetAction sets the assigns the Controller type, sets the action and initializes the controller
 func (c *Controller) SetTypeAction(controllerName, methodName string, typeOfController *ControllerType) error {
-
 	// Look up the controller and method types.
 	if typeOfController == nil {
 		if c.Type = ControllerTypeByName(controllerName, anyModule); c.Type == nil {
@@ -482,8 +481,8 @@ func findControllers(appControllerType reflect.Type) (indexes [][]int) {
 	for len(queue) > 0 {
 		// Get the next value and de-reference it if necessary.
 		var (
-			node = queue[0]
-			elem = node.val
+			node     = queue[0]
+			elem     = node.val
 			elemType = elem.Type()
 		)
 		if elemType.Kind() == reflect.Ptr {

controller_type.go

@@ -14,6 +14,7 @@ type ControllerType struct {
 	ControllerIndexes [][]int // FieldByIndex to all embedded *Controllers
 	ControllerEvents  *ControllerTypeEvents
 }
+
 type ControllerTypeEvents struct {
 	Before, After, Finally, Panic []*ControllerFieldPath
 }
@@ -141,6 +142,7 @@ func (cte *ControllerTypeEvents) check(theType reflect.Type, fieldPath []int) {
 		}
 	}
 }
+
 func newFieldPath(isPointer bool, value reflect.Value, fieldPath []int) *ControllerFieldPath {
 	return &ControllerFieldPath{IsPointer: isPointer, FunctionCall: value, FieldIndexPath: fieldPath}
 }

errors.go

@@ -34,7 +34,6 @@ type SourceLine struct {
 // provide a code listing of that, on the line that eventually triggered
 // the panic.  Returns nil if no relevant stack frame can be found.
 func NewErrorFromPanic(err interface{}) *Error {
-
 	// Parse the filename and line from the originating line of app code.
 	// /Users/robfig/code/gocode/src/revel/examples/booking/app/controllers/hotels.go:191 (0x44735)
 	stack := string(debug.Stack())

event_test.go

@@ -1,9 +1,10 @@
 package revel_test
 
 import (
+	"testing"
+
 	"github.com/revel/revel"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 // Test that the event handler can be attached and it dispatches the event received

fakeapp_test.go

@@ -134,12 +134,13 @@ func registerControllers() {
 			},
 		})
 }
+
 func startFakeBookingApp() {
 	Init("prod", "github.com/revel/revel/testdata", "")
 
 	MainTemplateLoader = NewTemplateLoader([]string{ViewsPath, filepath.Join(RevelPath, "templates")})
 	if err := MainTemplateLoader.Refresh(); err != nil {
-		RevelLog.Fatal("Template error","error",err)
+		RevelLog.Fatal("Template error", "error", err)
 	}
 
 	registerControllers()