fixed dep verisons for uuid. finished passing env around

This commit is contained in:
luke.rodham
2018-01-04 10:59:03 +00:00
parent 558e986a0f
commit 1e57ce3d8d
4 changed files with 46 additions and 63 deletions

65
Gopkg.lock generated
View File

@@ -17,7 +17,7 @@
branch = "master"
name = "github.com/daviddengcn/go-colortext"
packages = ["."]
revision = "805cee6e0d43c72ba1d4e3275965ff41e0da068a"
revision = "17e75f6184bc9e727756cd0d82e0af58b1fc7191"
[[projects]]
name = "github.com/fatih/color"
@@ -40,8 +40,8 @@
[[projects]]
name = "github.com/gobuffalo/buffalo"
packages = ["render"]
revision = "436dc23f762ecc9aef1c759db2e7c09193944414"
version = "v0.10.1"
revision = "4220930a985fea6cd3f207efa1f822940ab08c2b"
version = "v0.10.2"
[[projects]]
name = "github.com/gobuffalo/envy"
@@ -52,20 +52,20 @@
[[projects]]
name = "github.com/gobuffalo/packr"
packages = ["."]
revision = "aa752c1e501ca862dbb5720ff7c58b9289e68683"
version = "v1.9.0"
revision = "60f8243a040d5c5c80339403322a5a6fb56c2333"
version = "v1.9.10"
[[projects]]
name = "github.com/gobuffalo/plush"
packages = [".","ast","lexer","parser","token"]
revision = "7df6c6624e74b78e595d9500ab1acf810cdf7af1"
version = "v3.0.4"
revision = "f15814743c4d25c1bc5371e75d1ef51c9afdddba"
version = "v3.6.0"
[[projects]]
name = "github.com/gobuffalo/tags"
packages = [".","form","form/bootstrap"]
revision = "6755de03970f68812cfb0cb1162a66e60bcc1106"
version = "v1.4.0"
revision = "fd130d3e089cc2ae7285f7b4f3e45fd3f1aa3482"
version = "v1.9.0"
[[projects]]
name = "github.com/gorilla/context"
@@ -83,7 +83,7 @@
branch = "master"
name = "github.com/jmoiron/sqlx"
packages = [".","reflectx"]
revision = "3379e5993990b1f927fc8db926485e6f6becf2d2"
revision = "de8647470aafe4854c976707c431dbe1eb2822c6"
[[projects]]
name = "github.com/joho/godotenv"
@@ -95,7 +95,7 @@
branch = "master"
name = "github.com/lib/pq"
packages = [".","oid"]
revision = "b609790bd85edf8e9ab7e0f8912750a786177bcf"
revision = "83612a56d3dd153a94a629cd64925371c9adad78"
[[projects]]
branch = "master"
@@ -107,13 +107,13 @@
branch = "master"
name = "github.com/markbates/inflect"
packages = ["."]
revision = "b32533d044574b17faf5615eefb6c912e2099bd4"
revision = "a12c3aec81a6a938bf584a4bac567afed9256586"
[[projects]]
name = "github.com/markbates/pop"
packages = [".","columns","fizz","fizz/translators"]
revision = "f74995fdffa4ed212d13f3ebe280a58393f14fb5"
version = "v3.40.1"
revision = "b75753936c38f382be88b1ea4221b771994996c9"
version = "3.41.10"
[[projects]]
branch = "master"
@@ -124,8 +124,8 @@
[[projects]]
branch = "master"
name = "github.com/mattn/anko"
packages = ["ast","builtins","builtins/encoding/json","builtins/errors","builtins/flag","builtins/fmt","builtins/github.com/daviddengcn/go-colortext","builtins/io","builtins/io/ioutil","builtins/math","builtins/math/big","builtins/math/rand","builtins/net","builtins/net/http","builtins/net/url","builtins/os","builtins/os/exec","builtins/os/signal","builtins/path","builtins/path/filepath","builtins/regexp","builtins/runtime","builtins/sort","builtins/strings","builtins/time","parser","vm"]
revision = "2835104a087c32ce3d02bccd870e70e982b17583"
packages = ["ast","builtins","builtins/encoding/json","builtins/errors","builtins/flag","builtins/fmt","builtins/github.com/daviddengcn/go-colortext","builtins/io","builtins/io/ioutil","builtins/math","builtins/math/big","builtins/math/rand","builtins/net","builtins/net/http","builtins/net/url","builtins/os","builtins/os/exec","builtins/os/signal","builtins/path","builtins/path/filepath","builtins/regexp","builtins/runtime","builtins/sort","builtins/strconv","builtins/strings","builtins/time","parser","vm"]
revision = "3b446c7d031bdd754fc0183f599af173cd996715"
[[projects]]
name = "github.com/mattn/go-colorable"
@@ -142,14 +142,14 @@
[[projects]]
name = "github.com/mattn/go-sqlite3"
packages = ["."]
revision = "5160b48509cf5c877bc22c11c373f8c7738cdb38"
version = "v1.3.0"
revision = "ed69081a91fd053f17672236b0dd52ba7485e1a3"
version = "v1.4.0"
[[projects]]
branch = "master"
name = "github.com/microcosm-cc/bluemonday"
packages = ["."]
revision = "68fecaef60268522d2ac3f0123cec9d3bcab7b6e"
revision = "542fd4642604d0d0c26112396ce5b1a9d01eee0b"
[[projects]]
branch = "master"
@@ -178,32 +178,31 @@
[[projects]]
name = "github.com/satori/go.uuid"
packages = ["."]
revision = "879c5887cd475cd7864858769793b2ceb0d44feb"
version = "v1.1.0"
revision = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"
[[projects]]
branch = "master"
name = "github.com/serenize/snaker"
packages = ["."]
revision = "c7a77c38c398a5468cac9579c3b2b1de22fb4da6"
revision = "a683aaf2d516deecd70cad0c72e3ca773ecfcef0"
[[projects]]
branch = "master"
name = "github.com/sergi/go-diff"
packages = ["diffmatchpatch"]
revision = "2fc9cd33b5f86077aa3e0f442fa0476a9fa9a1dc"
revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
[[projects]]
branch = "master"
name = "github.com/shurcooL/github_flavored_markdown"
packages = ["."]
revision = "8071c74461cb0a1a6e8a677e868cbb79138510c9"
revision = "28433ea3fc83827d77424782fefdcd94703366cc"
[[projects]]
branch = "master"
name = "github.com/shurcooL/go"
packages = ["parserutil","printerutil","reflectfind","reflectsource"]
revision = "c661e953e604ba4a84a3c4e458462a481bd6ce72"
revision = "004faa6b0118cf52635363b72b51cdcc297800a2"
[[projects]]
branch = "master"
@@ -215,7 +214,7 @@
branch = "master"
name = "github.com/shurcooL/graphql"
packages = ["ident"]
revision = "cf6db17b893acfad0ca1929ba6be45bf854790ed"
revision = "d0549edd16dceb6939e538fdb1b4f2ec7ee816cc"
[[projects]]
branch = "master"
@@ -233,7 +232,7 @@
branch = "master"
name = "github.com/shurcooL/octiconssvg"
packages = ["."]
revision = "8c9861b86a08c72d14e0285d0dc313bb6df52295"
revision = "38b02129bb6460858e11f90798a3832da1e502bd"
[[projects]]
branch = "master"
@@ -256,14 +255,14 @@
[[projects]]
name = "github.com/stretchr/testify"
packages = ["assert","require"]
revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
version = "v1.1.4"
revision = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"
version = "v1.2.0"
[[projects]]
branch = "master"
name = "golang.org/x/net"
packages = ["context","html","html/atom"]
revision = "a337091b0525af65de94df2eb7e98bd9962dcbe2"
revision = "d866cfc389cec985d6fda2859936a575a55a3ab6"
[[projects]]
branch = "master"
@@ -275,17 +274,17 @@
branch = "master"
name = "golang.org/x/sys"
packages = ["unix"]
revision = "1e2299c37cc91a509f1b12369872d27be0ce98a6"
revision = "28a7276518d399b9634904daad79e18b44d481bc"
[[projects]]
branch = "v2"
name = "gopkg.in/yaml.v2"
packages = ["."]
revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"
revision = "c95af922eae69f190717a0b7148960af8c55a072"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "51eae27f28863a252458b48550cafcecabcd948c8112922acf1a2a001a477226"
inputs-digest = "5163286dab1e7d44b868e3b51dd6e9b26a3e0453511a704264e72c518f760856"
solver-name = "gps-cdcl"
solver-version = 1

View File

@@ -1,29 +1,6 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
[[constraint]]
name = "github.com/gobuffalo/buffalo"
version = "0.10.1"
version = "0.10.2"
[[constraint]]
name = "github.com/gorilla/context"
@@ -35,4 +12,8 @@
[[constraint]]
name = "github.com/stretchr/testify"
version = "1.1.4"
version = "1.2.0"
[[override]]
name = "github.com/satori/go.uuid"
revision = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"

View File

@@ -62,5 +62,6 @@ func (r *DefaultRouter) addRoute(m, p string, h Handler) {
Method: m,
Path: p,
Handler: h,
Env: r.env,
})
}

View File

@@ -1,23 +1,25 @@
package tuu
import (
"github.com/gorilla/mux"
"net/http"
"github.com/gorilla/mux"
gcontext "github.com/gorilla/context"
)
type Route struct {
Method string
Path string
Handler Handler
Method string
Path string
Handler Handler
MuxHandler mux.Route
Env string
}
func (r *Route) ServeHTTP(res http.ResponseWriter, req *http.Request) {
defer gcontext.Clear(req)
c := NewContext(*r, res, req)
c := NewContext(*r, res, req, r.Env)
if err := r.Handler(c); err != nil {
c.Response().WriteHeader(500)