Added fixed parameters addition on Reverse call

notzippy · notzippy · commit c57df47892c7 · 2017-08-01T12:22:01.000-07:00
Added Go report card to readme
Removed deprecation from Request.URL
Added request for HTTP_URL
Modified server adapter for go to provide HTTP_URL
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # Revel Framework
 
-[![Build Status](https://secure.travis-ci.org/revel/revel.svg?branch=master)](http://travis-ci.org/revel/revel)  [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+[![Build Status](https://secure.travis-ci.org/revel/revel.svg?branch=master)](http://travis-ci.org/revel/revel) 
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+[![Go Report Card](https://goreportcard.com/badge/github.com/revel/revel)](https://goreportcard.com/report/github.com/revel/revel)
 
 A high productivity, full-stack web framework for the [Go language](http://www.golang.org).
 
diff --git a/http.go b/http.go
@@ -31,7 +31,7 @@ type Request struct {
 	Method          string
 	RemoteAddr      string
 	Host            string
-	// DEPRECATED use request methods
+	// URL request path from the server (built)
 	URL             *url.URL
 	// DEPRECATED use GetForm()
 	Form url.Values
@@ -80,7 +80,7 @@ func (req *Request) SetRequest(r ServerRequest) {
 		req.ServerHeader.Server = h.(ServerHeader)
 	}
 
-	req.URL, _ = url.Parse(req.GetRequestURI())
+	req.URL,_ = req.GetValue(HTTP_URL).(*url.URL)
 	req.ContentType = ResolveContentType(req)
 	req.Format = ResolveFormat(req)
 	req.AcceptLanguages = ResolveAcceptLanguage(req)
diff --git a/router.go b/router.go
@@ -353,7 +353,11 @@ func splitActionPath(actionPathData *ActionPathData, actionPath string, useCache
 		}
 		action = actionSplit[1]
 	} else {
-		WARN.Printf("Invalid action path %s ", actionPath)
+		foundPaths := ""
+		for path:=range actionPathCacheMap {
+			foundPaths += path +","
+		}
+		WARN.Printf("Invalid action path %s found paths %s", actionPath, foundPaths)
 		found = false
 	}
 
@@ -665,8 +669,10 @@ func (router *Router) Reverse(action string, argValues map[string]string) (ad *A
 				if el == "" || (el[0] != ':' && el[0] != '*') {
 					continue
 				}
-
-				val, ok := argValues[el[1:]]
+				val, ok := pathData.FixedParamsByName[el[1:]]
+				if !ok {
+					val, ok = argValues[el[1:]]
+				}
 				if !ok {
 					val = "<nil>"
 					ERROR.Print("revel/router: reverse route missing route arg ", el[1:])
diff --git a/server-engine.go b/server-engine.go
@@ -33,6 +33,7 @@ const (
 	HTTP_REQUEST_URI    = iota + 1000
 	HTTP_REMOTE_ADDR    = iota + 1000
 	HTTP_HOST           = iota + 1000
+	HTTP_URL            = iota + 1000
 	HTTP_SERVER_HEADER  = iota + 1000
 	HTTP_STREAM_WRITER  = iota + 1000
 	HTTP_WRITER         = ENGINE_WRITER
diff --git a/server_adapter_go.go b/server_adapter_go.go
@@ -211,6 +211,8 @@ func (r *GoRequest) Get(key int) (value interface{}, err error) {
 		value = r.Original.URL.Path
 	case HTTP_HOST:
 		value = r.Original.Host
+	case HTTP_URL:
+		value = r.Original.URL
 	case HTTP_BODY:
 		value = r.Original.Body
 	default:
