Merge branch 'develop' into feature/contribution-guide-fix

brendensoares · web-flow · commit 159792c70e7a · 2017-03-16T22:59:37.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - git clone -b $REVEL_BRANCH git://github.com/revel/cmd ../cmd/
   - git clone -b $REVEL_BRANCH git://github.com/revel/config ../config/
   - git clone -b $REVEL_BRANCH git://github.com/revel/cron ../cron/
-  - git clone -b $REVEL_BRANCH git://github.com/revel/samples ../samples/
+  - git clone -b $REVEL_BRANCH git://github.com/revel/examples ../examples/
   - go get -v github.com/revel/revel/...
   - go get -v github.com/revel/cmd/revel
 
@@ -55,18 +55,10 @@ script:
   - revel package my/testapp
   - revel package my/testapp prod
 
-  # Build & run the sample apps
-  - revel test github.com/revel/samples/booking
-  - revel test github.com/revel/samples/chat
-  - revel test github.com/revel/samples/facebook-oauth2
-  - revel test github.com/revel/samples/twitter-oauth
-  - revel test github.com/revel/samples/validation
-  - revel test github.com/revel/samples/upload
-
   # Commented out persona test sample, since persona.org gonna be shutdown.
   # Also http://personatestuser.org becomes non-responsive most of the time.
   # https://wiki.mozilla.org/Identity/Persona_Shutdown_Guidelines_for_Reliers
-  # - revel test github.com/revel/samples/persona
+  # - revel test github.com/revel/examples/persona
 
 matrix:
   allow_failures:
diff --git a/errors.go b/errors.go
@@ -36,7 +36,7 @@ type SourceLine struct {
 func NewErrorFromPanic(err interface{}) *Error {
 
 	// Parse the filename and line from the originating line of app code.
-	// /Users/robfig/code/gocode/src/revel/samples/booking/app/controllers/hotels.go:191 (0x44735)
+	// /Users/robfig/code/gocode/src/revel/examples/booking/app/controllers/hotels.go:191 (0x44735)
 	stack := string(debug.Stack())
 	frame, basePath := findRelevantStackFrame(stack)
 	if frame == -1 {
diff --git a/params.go b/params.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2016 The Revel Framework Authors, All rights reserved.
+// Copyright (c) 2012-2017 The Revel Framework Authors, All rights reserved.
 // Revel Framework source code and usage is governed by a MIT style
 // license that can be found in the LICENSE file.
 
@@ -97,20 +97,27 @@ func (p *Params) calcValues() url.Values {
 		return p.Form
 	}
 
-	// Copy everything into the same map.
+	// Copy everything into a param map,
+	// order of priority is least to most trusted
 	values := make(url.Values, numParams)
-	for k, v := range p.Fixed {
+
+	// ?query vars first
+	for k, v := range p.Query {
 		values[k] = append(values[k], v...)
 	}
-	for k, v := range p.Query {
+	// form vars overwrite
+	for k, v := range p.Form {
 		values[k] = append(values[k], v...)
 	}
+	// :/path vars overwrite
 	for k, v := range p.Route {
 		values[k] = append(values[k], v...)
 	}
-	for k, v := range p.Form {
+	// fixed vars overwrite
+	for k, v := range p.Fixed {
 		values[k] = append(values[k], v...)
 	}
+
 	return values
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2012-2016 The Revel Framework Authors, All rights reserved.`
	`1`	`+// Copyright (c) 2012-2017 The Revel Framework Authors, All rights reserved.`
`2`	`2`	`// Revel Framework source code and usage is governed by a MIT style`
`3`	`3`	`// license that can be found in the LICENSE file.`
`4`	`4`
`@@ -97,20 +97,27 @@ func (p *Params) calcValues() url.Values {`
`97`	`97`	`return p.Form`
`98`	`98`	`}`
`99`	`99`
`100`		`- // Copy everything into the same map.`
	`100`	`+ // Copy everything into a param map,`
	`101`	`+ // order of priority is least to most trusted`
`101`	`102`	`values := make(url.Values, numParams)`
`102`		`- for k, v := range p.Fixed {`
	`103`	`+`
	`104`	`+ // ?query vars first`
	`105`	`+ for k, v := range p.Query {`
`103`	`106`	`values[k] = append(values[k], v...)`
`104`	`107`	`}`
`105`		`- for k, v := range p.Query {`
	`108`	`+ // form vars overwrite`
	`109`	`+ for k, v := range p.Form {`
`106`	`110`	`values[k] = append(values[k], v...)`
`107`	`111`	`}`
	`112`	`+ // :/path vars overwrite`
`108`	`113`	`for k, v := range p.Route {`
`109`	`114`	`values[k] = append(values[k], v...)`
`110`	`115`	`}`
`111`		`- for k, v := range p.Form {`
	`116`	`+ // fixed vars overwrite`
	`117`	`+ for k, v := range p.Fixed {`
`112`	`118`	`values[k] = append(values[k], v...)`
`113`	`119`	`}`
	`120`	`+`
`114`	`121`	`return values`
`115`	`122`	`}`
`116`	`123`