Spaces to tabs (gofmt) files

Added BufferedServerHeader to CompressWriter to prevent header from writing out immediately
Reduced object stack to a single controller stack which has the request and response objects already instaniated in it
Fixed go engine to match new spec
Modified code to make use of the Request object to access the ServerEngine (allows caching of ServerHeader and ResponseWriter)
Modified simple stack to add an upper bounds to the number of objects in cache, any more objects then the upper bounds will be left to garbage collect

harness/build.go

@@ -88,8 +88,9 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
 			revel.ImportPath, appVersion, revel.ImportPath, buildTime)
 
 		// TODO remove version check for versionLinkerFlags after Revel becomes Go min version to go1.5
-		goVersion, _ := strconv.ParseFloat(runtime.Version()[2:5], 64)
+		goVersion, err := strconv.ParseFloat(runtime.Version()[2:5], 64)
-		if goVersion < 1.5 {
+		// runtime.Version() may return commit hash, we assume it is above 1.5
+		if goVersion < 1.5 && err == nil {
 			versionLinkerFlags = fmt.Sprintf("-X %s/app.AppVersion \"%s\" -X %s/app.BuildTime \"%s\"",
 				revel.ImportPath, appVersion, revel.ImportPath, buildTime)
 		}
@@ -286,7 +287,7 @@ func calcImportAliases(src *SourceInfo) map[string]string {
 }
 
 func addAlias(aliases map[string]string, importPath, pkgName string) {
-	alias, ok := aliases[importPath]
+    alias, ok := aliases[importPath]
 	if ok {
 		return
 	}
@@ -297,7 +298,7 @@ func addAlias(aliases map[string]string, importPath, pkgName string) {
 func makePackageAlias(aliases map[string]string, pkgName string) string {
 	i := 0
 	alias := pkgName
-	for containsValue(aliases, alias) {
+	for containsValue(aliases, alias) || alias=="revel" {
 		alias = fmt.Sprintf("%s%d", pkgName, i)
 		i++
 	}

harness/harness.go

@@ -47,10 +47,12 @@ type Harness struct {
 	proxy      *httputil.ReverseProxy
 }
 
-func renderError(w http.ResponseWriter, r *http.Request, err error) {
+func renderError(iw http.ResponseWriter, ir *http.Request, err error) {
-	req, resp := revel.NewRequest(r), revel.NewResponse(w)
+	context := revel.NewGOContext(nil)
-	c := revel.NewController(req, resp)
+	context.Request.SetRequest(ir)
-	c.RenderError(err).Apply(req, resp)
+	context.Response.SetResponse(iw)
+	c := revel.NewController(context)
+	c.RenderError(err).Apply(c.Request, c.Response)
 }
 
 // ServeHTTP handles all requests.

harness/reflect.go

@@ -160,8 +160,20 @@ func ProcessSource(roots []string) (*SourceInfo, *revel.Error) {
 				return nil
 			}
 
+			// Ignore packages that end with _test
+			for i := range pkgs {
+				if len(i) > 6 {
+					if string(i[len(i)-5:]) == "_test" {
+						delete(pkgs, i)
+					}
+				}
+			}
+
 			// There should be only one package in this directory.
 			if len(pkgs) > 1 {
+				for i := range pkgs {
+					println("Found package ", i)
+				}
 				log.Println("Most unexpected! Multiple packages in a single directory:", pkgs)
 			}
 

revel/run.go

@@ -89,7 +89,12 @@ func parseRunArgs(args []string) *RunArgs {
 		// 1. revel run [import-path]
 		// 2. revel run [port]
 		// 3. revel run [run-mode]
-		if _, err := build.Import(args[0], "", build.FindOnly); err == nil {
+		_, err := build.Import(args[0], "", build.FindOnly)
+		if err != nil {
+			revel.WARN.Printf("Unable to run using an import path, assuming import path is working directory %s %s", args[0], err.Error())
+		}
+		println("Trying to build with", args[0], err)
+		if err == nil {
 			// 1st arg is the import path
 			inputArgs.ImportPath = args[0]
 		} else if port, err := strconv.Atoi(args[0]); err == nil {

revel/skeleton/app/init.go

@@ -29,7 +29,6 @@ func init() {
 		revel.ActionInvoker,           // Invoke the action.
 	}
 
-
 	// register startup functions with OnAppStart
 	// revel.DevMode and revel.RunMode only work inside of OnAppStart. See Example Startup Script
 	// ( order dependent )
@@ -43,9 +42,9 @@ func init() {
 // should probably also have a filter for CSRF
 // not sure if it can go in the same filter or not
 var HeaderFilter = func(c *revel.Controller, fc []revel.Filter) {
-	c.Response.Out.Header().Add("X-Frame-Options", "SAMEORIGIN")
+	c.Response.SetHttpHeader("X-Frame-Options", "SAMEORIGIN")
-	c.Response.Out.Header().Add("X-XSS-Protection", "1; mode=block")
+	c.Response.SetHttpHeader("X-XSS-Protection", "1; mode=block")
-	c.Response.Out.Header().Add("X-Content-Type-Options", "nosniff")
+	c.Response.SetHttpHeader("X-Content-Type-Options", "nosniff")
 
 	fc[0](c, fc[1:]) // Execute the next filter stage.
 }

revel/skeleton/conf/app.conf.template

@@ -3,7 +3,8 @@
 # More info at http://revel.github.io/manual/appconf.html
 ################################################################################
 
-# Sets the `AppName` variable which can be used in your code as
+# Sets `revel.AppName` for use in-app.
+# Example:
 #   `if revel.AppName {...}`
 app.name = {{ .AppName }}
 
@@ -13,7 +14,7 @@ app.name = {{ .AppName }}
 # into your application
 app.secret = {{ .Secret }}
 
-# Revel running behind proxy like nginx, haproxy, etc
+# Revel running behind proxy like nginx, haproxy, etc.
 app.behind.proxy = false
 
 
@@ -57,10 +58,11 @@ cookie.prefix = REVEL
 # as false.
 # cookie.secure = false
 
-# Limit cookie access to a given domain
+# Limit cookie access to a given domain.
 #cookie.domain =
 
-# Define when your session cookie expires. Possible values:
+# Define when your session cookie expires.
+# Values:
 # "720h"
 #   A time duration (http://golang.org/pkg/time/#ParseDuration) after which
 #   the cookie expires and the session is invalid.
@@ -82,7 +84,7 @@ format.datetime = 2006-01-02 15:04
 results.chunked = false
 
 
-# Prefixes for each log message line
+# Prefixes for each log message line.
 # User can override these prefix values within any section
 # For e.g: [dev], [prod], etc
 log.trace.prefix = "TRACE "
@@ -107,30 +109,57 @@ module.static=github.com/revel/modules/static
 
 
 ################################################################################
+
 # Section: dev
 # This section is evaluated when running Revel in dev mode. Like so:
 #   `revel run path/to/myapp`
 [dev]
-# This sets `DevMode` variable to `true` which can be used in your code as
+
+# This sets `revel.DevMode` for use in-app.
+# Example:
 #   `if revel.DevMode {...}`
 #   or in your templates with
 #   `{{.DevMode}}`
+# Values:
+# "true"
+#   Sets `DevMode` to `true`.
+# "false"
+#   Sets `DevMode` to `false`.
 mode.dev = true
 
 
 # Pretty print JSON/XML when calling RenderJSON/RenderXML
+# Values:
+# "true"
+#   Enables pretty printing.
+# "false"
+#   Disables pretty printing.
 results.pretty = true
 
 
-# Automatically watches your applicaton files and recompiles on-demand
+# Watch your applicaton files for changes and automatically rebuild
+# Values:
+# "true"
+#   Enables auto rebuilding. 
+# "false"
+#   Disables auto rebuilding.
 watch = true
 
 
-# If you set watch.mode = "eager", the server starts to recompile
+# Define when to rebuild new changes.
-# your application every time your application's files change.
+# Values:
-watch.mode = "normal"
+# "normal"
+#   Rebuild when a new request is received and changes have been detected.
+# "eager"
+#   Rebuild as soon as changes are detected.
+watch.mode = normal
 
-# Watch the entire $GOPATH for code changes. Default is false.
+# Watch the entire `$GOPATH` for changes.
+# Values:
+# "true"
+#   Includes `$GOPATH` in watch path.
+# "false"
+#   Excludes `$GOPATH` from watch path. Default value.
 #watch.gopath = true
 
 
@@ -141,20 +170,34 @@ module.testrunner = github.com/revel/modules/testrunner
 
 
 # Where to log the various Revel logs
+# Values:
+# "off"
+#   Disable log output.
+# "stdout"
+#   Log to OS's standard output.
+# "stderr"
+#   Log to Os's standard error output. Default value.
+# "relative/path/to/log"
+#   Log to file.
 log.trace.output = off
 log.info.output  = stderr
 log.warn.output  = stderr
 log.error.output = stderr
 
 
-# Revel log flags. Possible flags defined by the Go `log` package,
+# Revel log flags. Possible flags defined by the Go `log` package. Go log is
-# please refer https://golang.org/pkg/log/#pkg-constants
+# "Bits OR'ed together to control what's printed
-# Go log is "Bits or'ed together to control what's printed"
+# See:
-# Examples:
+#   https://golang.org/pkg/log/#pkg-constants
-#   0  => just log the message, turn off the flags
+# Values:
-#   3  => log.LstdFlags (log.Ldate|log.Ltime)
+# "0"
-#   19 => log.Ldate|log.Ltime|log.Lshortfile
+#   Just log the message, turn off the flags.
-#   23 => log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile
+# "3"
+#   log.LstdFlags (log.Ldate|log.Ltime)
+# "19"
+#   log.Ldate|log.Ltime|log.Lshortfile
+# "23"
+#   log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile
 log.trace.flags = 19
 log.info.flags  = 19
 log.warn.flags  = 19
@@ -169,6 +212,7 @@ log.error.flags = 19
 log.request.output = stderr
 
 
+
 ################################################################################
 # Section: prod
 # This section is evaluated when running Revel in production mode. Like so:
@@ -176,18 +220,15 @@ log.request.output = stderr
 # See:
 #  [dev] section for documentation of the various settings
 [prod]
-mode.dev = false
 
+mode.dev = false
 
 results.pretty = false
 
-
 watch = false
 
-
 module.testrunner =
 
-
 log.trace.output = off
 log.info.output  = off
 log.warn.output  = log/%(app.name)s.log