revel#1054 cross platform support

jeevatkm · jeevatkm · commit d668b0091806 · 2016-06-07T00:20:13.000-07:00
diff --git a/fakeapp_test.go b/fakeapp_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"path"
+	"path/filepath"
 	"reflect"
 )
 
@@ -42,11 +42,11 @@ func (c Hotels) Index() Result {
 func (c Static) Serve(prefix, filepath string) Result {
 	var basePath, dirName string
 
-	if !path.IsAbs(dirName) {
+	if !filepath.IsAbs(dirName) {
 		basePath = BasePath
 	}
 
-	fname := path.Join(basePath, prefix, filepath)
+	fname := filepath.Join(basePath, prefix, filepath)
 	file, err := os.Open(fname)
 	if os.IsNotExist(err) {
 		return c.NotFound("")
@@ -66,7 +66,7 @@ func startFakeBookingApp() {
 	WARN = TRACE
 	ERROR = TRACE
 
-	MainTemplateLoader = NewTemplateLoader([]string{ViewsPath, path.Join(RevelPath, "templates")})
+	MainTemplateLoader = NewTemplateLoader([]string{ViewsPath, filepath.Join(RevelPath, "templates")})
 	MainTemplateLoader.Refresh()
 
 	RegisterController((*Hotels)(nil),
diff --git a/revel.go b/revel.go
@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -32,18 +31,18 @@ var (
 	// App details
 	AppName    string // e.g. "sample"
 	AppRoot    string // e.g. "/app1"
-	BasePath   string // e.g. "/Users/robfig/gocode/src/corp/sample"
-	AppPath    string // e.g. "/Users/robfig/gocode/src/corp/sample/app"
-	ViewsPath  string // e.g. "/Users/robfig/gocode/src/corp/sample/app/views"
+	BasePath   string // e.g. "$GOPATH/src/corp/sample"
+	AppPath    string // e.g. "$GOPATH/src/corp/sample/app"
+	ViewsPath  string // e.g. "$GOPATH/src/corp/sample/app/views"
 	ImportPath string // e.g. "corp/sample"
-	SourcePath string // e.g. "/Users/robfig/gocode/src"
+	SourcePath string // e.g. "$GOPATH/src"
 
 	Config  *config.Context
 	RunMode string // Application-defined (by default, "dev" or "prod")
 	DevMode bool   // if true, RunMode is a development mode.
 
 	// Revel installation details
-	RevelPath string // e.g. "/Users/robfig/gocode/src/revel"
+	RevelPath string // e.g. "$GOPATH/src/github.com/revel/revel"
 
 	// Where to look for templates
 	// Ordered by priority. (Earlier paths take precedence over later paths.)
@@ -136,7 +135,7 @@ func Init(mode, importPath, srcPath string) {
 		revelSourcePath, SourcePath = findSrcPaths(importPath)
 	} else {
 		// If the SourcePath was specified, assume both Revel and the app are within it.
-		SourcePath = path.Clean(SourcePath)
+		SourcePath = filepath.Clean(SourcePath)
 		revelSourcePath = SourcePath
 		packaged = true
 	}
@@ -158,14 +157,14 @@ func Init(mode, importPath, srcPath string) {
 	// 3. user supplied configs (...) - User configs can override/add any from above
 	ConfPaths = append(
 		[]string{
-			path.Join(RevelPath, "conf"),
-			path.Join(BasePath, "conf"),
+			filepath.Join(RevelPath, "conf"),
+			filepath.Join(BasePath, "conf"),
 		},
 		ConfPaths...)
 
 	TemplatePaths = []string{
 		ViewsPath,
-		path.Join(RevelPath, "templates"),
+		filepath.Join(RevelPath, "templates"),
 	}
 
 	// Load app.conf
@@ -343,7 +342,7 @@ func loadModules() {
 // Returns an error if the import path could not be found.
 func ResolveImportPath(importPath string) (string, error) {
 	if packaged {
-		return path.Join(SourcePath, importPath), nil
+		return filepath.Join(SourcePath, importPath), nil
 	}
 
 	modPkg, err := build.Import(importPath, "", build.FindOnly)
diff --git a/router.go b/router.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"path"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -300,7 +300,7 @@ func getModuleRoutes(moduleName, joinedPath string, validate bool) ([]*Route, *E
 		INFO.Println("Skipping routes for inactive module", moduleName)
 		return nil, nil
 	}
-	return parseRoutesFile(path.Join(module.Path, "conf", "routes"), joinedPath, validate)
+	return parseRoutesFile(filepath.Join(module.Path, "conf", "routes"), joinedPath, validate)
 }
 
 // Groups:
@@ -422,7 +422,7 @@ func (router *Router) Reverse(action string, argValues map[string]string) *Actio
 
 func init() {
 	OnAppStart(func() {
-		MainRouter = NewRouter(path.Join(BasePath, "conf", "routes"))
+		MainRouter = NewRouter(filepath.Join(BasePath, "conf", "routes"))
 		err := MainRouter.Refresh()
 		if MainWatcher != nil && Config.BoolDefault("watch.routes", true) {
 			MainWatcher.Listen(MainRouter, MainRouter.path)
diff --git a/server_test.go b/server_test.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 	"testing"
 )
@@ -63,7 +63,7 @@ func TestFakeServer(t *testing.T) {
 	resp.Body.Reset()
 
 	handle(resp, staticRequest)
-	sessvarsSize := getFileSize(t, path.Join(BasePath, "public", "js", "sessvars.js"))
+	sessvarsSize := getFileSize(t, filepath.Join(BasePath, "public", "js", "sessvars.js"))
 	if int64(resp.Body.Len()) != sessvarsSize {
 		t.Errorf("Expected sessvars.js to have %d bytes, got %d:\n%s", sessvarsSize, resp.Body.Len(), resp.Body)
 		t.FailNow()
diff --git a/skeleton/conf/app.conf.template b/skeleton/conf/app.conf.template
@@ -35,6 +35,12 @@ http.ssl = false
 #http.sslkey =
 
 
+# Timeout specifies a time limit for request (in seconds) made by a single client.
+# A Timeout of zero means no timeout.
+timeout.read = 90
+timeout.write = 60
+
+
 # For any cookies set by Revel (Session,Flash,Error) these properties will set
 # the fields of:
 # http://golang.org/pkg/net/http/#Cookie
@@ -69,11 +75,6 @@ session.expires = 720h
 format.date     = 2006-01-02
 format.datetime = 2006-01-02 15:04
 
-# Timeout specifies a time limit for request (in seconds) made by a single client.
-# A Timeout of zero means no timeout.
-timeout.read = 90
-timeout.write = 60
-
 
 # Determines whether the template rendering should use chunked encoding.
 # Chunked encoding can decrease the time to first byte on the client side by
diff --git a/util_test.go b/util_test.go
@@ -1,7 +1,6 @@
 package revel
 
 import (
-	"path"
 	"path/filepath"
 	"reflect"
 	"testing"
@@ -16,7 +15,7 @@ func TestContentTypeByFilename(t *testing.T) {
 		"hello.world.c": "text/x-c; charset=utf-8",
 	}
 	srcPath, _ := findSrcPaths(REVEL_IMPORT_PATH)
-	ConfPaths = []string{path.Join(
+	ConfPaths = []string{filepath.Join(
 		srcPath,
 		filepath.FromSlash(REVEL_IMPORT_PATH),
 		"conf"),
diff --git a/watcher.go b/watcher.go
@@ -2,7 +2,6 @@ package revel
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -191,7 +190,7 @@ func (w *Watcher) eagerRebuildEnabled() bool {
 
 func (w *Watcher) rebuildRequired(ev fsnotify.Event, listener Listener) bool {
 	// Ignore changes to dotfiles.
-	if strings.HasPrefix(path.Base(ev.Name), ".") {
+	if strings.HasPrefix(filepath.Base(ev.Name), ".") {
 		return false
 	}
 
