diff --git a/SHOULDERS.md b/SHOULDERS.md index 9e92061ab..e263a53f8 100644 --- a/SHOULDERS.md +++ b/SHOULDERS.md @@ -7,6 +7,8 @@ Thank you to the following **GIANTS**: * [github.com/BurntSushi/toml](https://godoc.org/github.com/BurntSushi/toml) +* [github.com/blang/semver](https://godoc.org/github.com/blang/semver) + * [github.com/cockroachdb/cockroach-go/crdb](https://godoc.org/github.com/cockroachdb/cockroach-go/crdb) * [github.com/dustin/go-humanize](https://godoc.org/github.com/dustin/go-humanize) @@ -53,6 +55,14 @@ Thank you to the following **GIANTS**: * [github.com/gobuffalo/github_flavored_markdown/internal/russross/blackfriday](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/russross/blackfriday) +* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_diff](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_diff) + +* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_go](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/highlight_go) + +* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/octicon](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/octicon) + +* [github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/sanitized_anchor_name](https://godoc.org/github.com/gobuffalo/github_flavored_markdown/internal/shurcooL/sanitized_anchor_name) + * [github.com/gobuffalo/logger](https://godoc.org/github.com/gobuffalo/logger) * [github.com/gobuffalo/makr](https://godoc.org/github.com/gobuffalo/makr) @@ -61,6 +71,8 @@ Thank you to the following **GIANTS**: * [github.com/gobuffalo/meta](https://godoc.org/github.com/gobuffalo/meta) +* [github.com/gobuffalo/packd](https://godoc.org/github.com/gobuffalo/packd) + * [github.com/gobuffalo/packr](https://godoc.org/github.com/gobuffalo/packr) * [github.com/gobuffalo/plush](https://godoc.org/github.com/gobuffalo/plush) @@ -173,14 +185,6 @@ Thank you to the following **GIANTS**: * [github.com/sergi/go-diff/diffmatchpatch](https://godoc.org/github.com/sergi/go-diff/diffmatchpatch) -* [github.com/shurcooL/highlight_diff](https://godoc.org/github.com/shurcooL/highlight_diff) - -* [github.com/shurcooL/highlight_go](https://godoc.org/github.com/shurcooL/highlight_go) - -* [github.com/shurcooL/octicon](https://godoc.org/github.com/shurcooL/octicon) - -* [github.com/shurcooL/sanitized_anchor_name](https://godoc.org/github.com/shurcooL/sanitized_anchor_name) - * [github.com/sirupsen/logrus](https://godoc.org/github.com/sirupsen/logrus) * [github.com/sourcegraph/annotate](https://godoc.org/github.com/sourcegraph/annotate) diff --git a/appveyor.yml b/appveyor.yml index 3309261b8..933eace89 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ stack: go 1.11 install: - cmd: >- - choco install mingw + choco install mingw --version 5.3.0 set PATH=%GOPATH%\bin;%GOBIN%\bin;c:\tools\mingw64\bin;%PATH% diff --git a/genny/build/a_build-packr.go b/genny/build/a_build-packr.go index 063aa9ce7..009d641e3 100644 --- a/genny/build/a_build-packr.go +++ b/genny/build/a_build-packr.go @@ -7,7 +7,7 @@ import "github.com/gobuffalo/packr" // You can use the "packr clean" command to clean up this, // and any other packr generated files. func init() { - packr.PackJSONBytes("../build/templates", "a/a.go.plush", "\"cGFja2FnZSBhCgppbXBvcnQgKAogICJsb2ciCiAgInN0cmluZ3MiCiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL3BvcCIKICAiZ2l0aHViLmNvbS9tYXJrYmF0ZXMvaW5mbGVjdCIKICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vcGFja3IiCiAgPCU9IGlmIChvcHRzLkVudmlyb25tZW50ICE9ICJkZXZlbG9wbWVudCIpIHsgJT4KICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vZW52eSIKICA8JSB9ICU+CikKCmZ1bmMgaW5pdCgpIHsKICA8JT0gaWYgKG9wdHMuRW52aXJvbm1lbnQgIT0gImRldmVsb3BtZW50IikgeyAlPgogIGlmIGVyciA6PSBlbnZ5Lk11c3RTZXQoIkdPX0VOViIsICI8JT0gb3B0cy5FbnZpcm9ubWVudCAlPiIpOyBlcnIgIT0gbmlsIHsKICAgICAgbG9nLkZhdGFsKGVycikKICB9CiAgPCUgfSAlPgoKICBkcm9wRGF0YWJhc2VZbWwoKQoKICBib3ggOj0gcGFja3IuTmV3Qm94KCIuLyIpCiAgaWYgYm94LkhhcygiaW5mbGVjdGlvbnMuanNvbiIpIHsKICAgIHIgOj0gc3RyaW5ncy5OZXdSZWFkZXIoYm94LlN0cmluZygiaW5mbGVjdGlvbnMuanNvbiIpKQogICAgZXJyIDo9IGluZmxlY3QuTG9hZFJlYWRlcihyKQogICAgaWYgZXJyICE9IG5pbCB7CiAgICAgIGxvZy5GYXRhbChlcnIpCiAgICB9CiAgfQp9CgpmdW5jIGRyb3BEYXRhYmFzZVltbCgpIHsKICBpZiBEQl9DT05GSUcgIT0gIiIgewogICAgciA6PSBzdHJpbmdzLk5ld1JlYWRlcihEQl9DT05GSUcpCiAgICBlcnIgOj0gcG9wLkxvYWRGcm9tKHIpCiAgICBpZiBlcnIgIT0gbmlsIHsKICAgICAgbG9nLkZhdGFsKGVycikKICAgIH0KICB9Cn0K\"") - packr.PackJSONBytes("../build/templates", "buffalo_build_main.go.plush", "\"cGFja2FnZSBtYWluCgppbXBvcnQgKAogICJmbXQiCiAgImxvZyIKICAib3MiCiAgIm9zL2V4ZWMiCiAgInRpbWUiCgogICJnaXRodWIuY29tL21hcmtiYXRlcy9ncmlmdC9ncmlmdCIKICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vYnVmZmFsby9ydW50aW1lIgogIF8gIjwlPSBvcHRzLlBhY2thZ2VQa2cgJT4vYSIKICBfICI8JT0gb3B0cy5BY3Rpb25zUGtnICU+IgogIDwlPSBpZiAob3B0cy5XaXRoUG9wKSB7ICU+CiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL3BhY2tyIgogICJnaXRodWIuY29tL2dvYnVmZmFsby9wb3AiCiAgIjwlPSBvcHRzLk1vZGVsc1BrZyAlPiIKICA8JSB9ICU+CiAgPCU9IGlmIChvcHRzLldpdGhHcmlmdHMpIHsgJT4KICBfICI8JT0gb3B0cy5HcmlmdHNQa2cgJT4iCiAgPCUgfSAlPgopCgpmdW5jIGluaXQoKSB7CnQsIGVyciA6PSB0aW1lLlBhcnNlKHRpbWUuUkZDMzMzOSwgIjwlPSBidWlsZFRpbWUgJT4iKQogIGlmIGVyciAhPSBuaWwgewogICAgZm10LlByaW50bG4oZXJyKQogIH0KICBydW50aW1lLlNldEJ1aWxkKHJ1bnRpbWUuQnVpbGRJbmZvewogIFZlcnNpb246ICI8JT0gYnVpbGRWZXJzaW9uICU+IiwKICAgIFRpbWU6IHQsCiAgfSkKfQoKZnVuYyBtYWluKCkgewogIGFyZ3MgOj0gb3MuQXJncwogIGlmIGxlbihhcmdzKSA9PSAxIHsKICAgIG9yaWdpbmFsTWFpbigpCiAgICByZXR1cm4KICB9CiAgYyA6PSBhcmdzWzFdCiAgc3dpdGNoIGMgewogIDwlPSBpZiAob3B0cy5XaXRoUG9wKSB7ICU+CiAgY2FzZSAibWlncmF0ZSI6CiAgICBtaWdyYXRlKCkKICA8JSB9ICU+CiAgY2FzZSAidmVyc2lvbiI6CiAgICBwcmludFZlcnNpb24oKQogIGNhc2UgInRhc2siLCAidCIsICJ0YXNrcyI6CiAgICBpZiBsZW4oYXJncykgPCAzIHsKICAgICAgbG9nLkZhdGFsKCJub3QgZW5vdWdoIGFyZ3VtZW50cyBwYXNzZWQgdG8gdGFzayIpCiAgICB9CiAgICBjIDo9IGdyaWZ0Lk5ld0NvbnRleHQoYXJnc1syXSkKICAgIGlmIGxlbihhcmdzKSA+IDIgewogICAgICBjLkFyZ3MgPSBhcmdzWzM6XQogICAgfQogICAgZXJyIDo9IGdyaWZ0LlJ1bihhcmdzWzJdLCBjKQogICAgaWYgZXJyICE9IG5pbCB7CiAgICAgIGxvZy5GYXRhbChlcnIpCiAgICB9CiAgZGVmYXVsdDoKICAgIGlmIF8sIGVyciA6PSBleGVjLkxvb2tQYXRoKCJidWZmYWxvIik7IGVyciAhPSBuaWwgewogICAgICBpZiBlcnIgIT0gbmlsIHsKICAgICAgICBsb2cuRmF0YWwoZXJyKQogICAgICB9CiAgICB9CiAgICBjbWQgOj0gZXhlYy5Db21tYW5kKCJidWZmYWxvIiwgYXJnc1sxOl0uLi4pCiAgICBjbWQuU3RkaW4gPSBvcy5TdGRpbgogICAgY21kLlN0ZG91dCA9IG9zLlN0ZG91dAogICAgY21kLlN0ZGVyciA9IG9zLlN0ZGVycgogICAgZXJyIDo9IGNtZC5SdW4oKQogICAgaWYgZXJyICE9IG5pbCB7CiAgICAgIGxvZy5GYXRhbChlcnIpCiAgICB9CiAgfQp9CgpmdW5jIHByaW50VmVyc2lvbigpIHsKICBmbXQuUHJpbnRmKCI8JT0gb3B0cy5OYW1lLlRpdGxlKCkgJT4gdmVyc2lvbiAlc1xuIiwgcnVudGltZS5CdWlsZCgpKQp9Cgo8JT0gaWYgKG9wdHMuV2l0aFBvcCkgeyAlPgpmdW5jIG1pZ3JhdGUoKSB7CiAgYm94LCBlcnIgOj0gcG9wLk5ld01pZ3JhdGlvbkJveChwYWNrci5OZXdCb3goIi4vbWlncmF0aW9ucyIpLCBtb2RlbHMuREIpCiAgaWYgZXJyICE9IG5pbCB7CiAgICBsb2cuRmF0YWxmKCJGYWlsZWQgdG8gdW5wYWNrIG1pZ3JhdGlvbnM6ICVzIiwgZXJyKQogIH0KICBlcnIgPSBib3guVXAoKQogIGlmIGVyciAhPSBuaWwgewogICAgbG9nLkZhdGFsZigiRmFpbGVkIHRvIHJ1biBtaWdyYXRpb25zOiAlcyIsIGVycikKICB9Cn0KPCUgfSAlPgo=\"") - packr.PackJSONBytes("../build/templates", "migrations/-dot-pop-tmp.md", "\"aGkhIGknbSBqdXN0IGhlcmUgdG8gZW5zdXJlIHRoYXQgYGJ1ZmZhbG8gYnVpbGRgIGhhcyBhIGAuL21pZ3JhdGlvbnNgIGlmIHRoZSBhcHBsaWNhdGlvbiBoYXMgcG9wLgoKdW5mb3J0dW5hdGVseSwgaSdtIGp1c3QgdGVtcG9yYXJ5LCBzbyBhcyBtdWNoIGFzIGkgd291bGQgbG92ZSB0byBtZWV0IHlvdSwgYW5kIHRydXN0IG1lLCBpIHJlYWxseSB3b3VsZCAoaSd2ZSBoZWFyZCBnb29kIHRoaW5ncyksIGkgaGF2ZSB0byBiZSBnb2luZy4gOigKCmlmIHlvdSdyZSBzZWVpbmcgbWUgaW4geW91ciBhcHBsaWNhdGlvbiwgdGhlbiBzb21ldGhpbmcgaG9ycmlibHksIGhvcnJpYmx5IHdyb25nIGhhcHBlbmVkIGR1cmluZyBgYnVmZmFsbyBidWlsZGAsIG9yIHlvdSByYW4gaXQgd2l0aCB0aGUgYC1kYCBmbGFnLiA6KQoKcmVnYXJkbGVzcywgc2hvdWxkIHlvdSBjb21lIGFjcm9zcyBtZSBsYXlpbmcgYWJvdXQsIGZlZWwgZnJlZSBhbmQgZGVsZXRlIG1lLiBpdCdzIG9rLiBpdCB3b24ndCBodXJ0LiB3ZWxsLCBpdCBtaWdodCBpZiB5b3UgdXNlIHRoZSBgLWZgIGZsYWcsIGkgZG9uJ3Qga25vdy4KCmknbGwgbGVhdmUgeW91IHdpdGggdGhlc2UgZmFtb3VzIHBhcnRpbmcgd29yZHM6Cgo+PiBTbyBsb25nLCBhbmQgdGhhbmtzIGZvciBhbGwgdGhlIGZpc2gK\"") + packr.PackJSONBytes("../build/templates", "a/a.go.plush", "\"H4sIAAAAAAAA/5xRUYsTMRB+z6+YCxQSkOy7uvdw3vUUtAULgk8lu5tdY7OZkGRrpex/l2SDqNUKzUuSmfm++b4ZJ9uDHBRIQvTo0EdgBIAaHGi6Q/TaDiG/Bx2/TI1ocawGbKa+lwYrh+7P5Cj9oZFRhUrb3qg2XkHL9uBT+vWqBt0DQxeDeLJH7dGOyka4q4F26qgMuvSnHM6wuv8nobLH7wsfzKmOE9JPtgVtdWQczje10j0o7+FlDYlefJhC3KnI6PN2/7T5RF8ATZwXfKt7yl9l5F0NVpvcPR2Dg1jLKA1T3nMCMP+imAB0Ht2jjLKRQX0eDeMp2OApKcgTExv17QFPjIqK8kVggyfxVgZGy8w12iC+BrSUl77ZQNlnIvioZKc8S8Bdjv4NyzO0uC9p8R5lV9B+KSgT+p/PxelM5rKVC6MZqnt4fNi/2W7W757zUuh1Bz+LfxPr0GWha4/jzTJ/BAAA///A1D2JHgMAAA==\"") + packr.PackJSONBytes("../build/templates", "buffalo_build_main.go.plush", "\"H4sIAAAAAAAA/5xU32vbMBB+919xEwRsMAptnpY1gbajY7CW0HbbQxeK4siOiCUZ6dwGSv73oR92kqYtbC/Wjzt9393nu2tYsWYVB8mEShIhG20Q0gSAlBKJW2td+VXbuAz5hhd+j0JykrhdJXDVLmih5VAys14w5HZYGVFi+JJXTpVetGXJaj3sVtOqAAfwCORsMAHdoKWzEN9sXcFgOmSvzecFCq1sMDujs4gSUm/9LXA1000GLzCYvhuBk8C8H2CjG2/sOa/1ktcHlLAN+Efk31zutuffjzyYjlGyJClbVYBQAtMMXhLMgRsD4wk4feiMGctTv729uhyNRp/zgLpoRb28F5I7wCwBF4l7+GkCStTwkgAAlBLpzAiFtUq5Mc5tmwBE8ekdxwsHk3YX/vRdldo9/8WNFVqN9/jilaPMPYELYAzoDtss2cZkXHX5ZACYqaxLRlt6biob4qy5Sp0hg8kETmKs2ohKKFZf+8f+ynBsjYpBFw7GvXo4mScA9llgsYLCv/6wDApmORApKsOQk7FHjifPs/uhwfMpJBk9GydfzNu7Bydkdk1yIOg/zK5t9D9I7wxGMTuAWlf0iiGrU6I0Ale6rVYuoVZyhRYaZi1fAmrw2EGBrf/61H1j0Rv+fKkV8g16iofTeXZMO4XTnrbwukOUbjSe7+HGQgvIt63qIHMoetSjmtrPJNZUwFvykrU19jI89pXsJgj9ofV6xnCVkthqJPvyFvrbnG+ydnlEleSyJ7vUUjK13HHlsXTGc0pp1vnTO1wKBb48/XbfoFvsLbrFfZMLsDNxY/bFdB5Oyv8QcNs30GHR+Xd9K5fpbqrcMMnpvcCapxkMpvDU9af9o0gOB22dZr5BP2iV0LtdZ3jWhd70f7HRjSu/a+8gtLrQm9QPU3frDoQOZWe0JMtB+tFJv168N596IcqUXDFRh/pvlYOFHdYYBpb4OLoJFn7AQm/ozyb9N3TTqg+gt0k3Dv4GAAD//wtAi1UrBwAA\"") + packr.PackJSONBytes("../build/templates", "migrations/-dot-pop-tmp.md", "\"H4sIAAAAAAAA/1xRTW7cOgze6xTfWzkB/Nx9FrlEL2DOiLLYkUSDkmL49oU8E7ToygTN71dR/oNMGb96bYhsjKbgUvuYIjWstx4CJcWtS/IrIlUQ1uVHls2oiZa6QgJaZNC+J7lfy+tu131xrpeg1nqhxumc/6g1zrsa2TmjKqgi93scX8GhPXkk/brsZOaGU/sMKh7NBjjzDIExpXS+zt9k+mJEJvPYVD1alLLV93EY6Ul1Y2wqZVvw8eachEE7GaMyS9mQGVLGzv7OMo9wBVUzX5SIaia3EeZ7wmE6ftC+c2EP320c/lPeDLXBDqMCaTikxau49X+/IiQavt6dM97IfOJaZ9R4hRuou2YG3U1rHU4TnUODbtrbjMCcEIz5Kslz4sbIvEDaVKGP5RLUMjXEbm3BwSnNY5lliw3PLtArvxyFp6PRnr9gj6LH4pxMKSHxKHQAvjNURqCsvWIna8PYoebrh3Ofn/ipSFq21wNGKo+KoAZK6VILUqP7HQAA///THlhKiwIAAA==\"") } diff --git a/go.mod b/go.mod index 7402c4f8d..0ef3c9df5 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,10 @@ require ( github.com/fatih/color v1.7.0 github.com/gobuffalo/buffalo-docker v1.0.4 github.com/gobuffalo/buffalo-plugins v1.6.7 - github.com/gobuffalo/buffalo-pop v1.1.7 + github.com/gobuffalo/buffalo-pop v1.1.8 github.com/gobuffalo/envy v1.6.7 github.com/gobuffalo/events v1.1.5 - github.com/gobuffalo/fizz v1.0.15 // indirect + github.com/gobuffalo/fizz v1.0.16 // indirect github.com/gobuffalo/flect v0.0.0-20181024204909-8f6be1a8c6c2 github.com/gobuffalo/genny v0.0.0-20181030163439-ed103521b8ec github.com/gobuffalo/github_flavored_markdown v1.0.7 @@ -25,10 +25,10 @@ require ( github.com/gobuffalo/mw-i18n v0.0.0-20181027200759-09e0c99be4d3 github.com/gobuffalo/mw-paramlogger v0.0.0-20181005191442-d6ee392ec72e github.com/gobuffalo/mw-tokenauth v0.0.0-20181001105134-8545f626c189 - github.com/gobuffalo/packd v0.0.0-20181029140631-cf76bd87a5a6 - github.com/gobuffalo/packr v1.16.0 - github.com/gobuffalo/plush v3.7.21+incompatible - github.com/gobuffalo/pop v4.8.7+incompatible + github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264 + github.com/gobuffalo/packr v1.17.0 + github.com/gobuffalo/plush v3.7.22+incompatible + github.com/gobuffalo/pop v4.8.8+incompatible github.com/gobuffalo/tags v2.0.11+incompatible github.com/gobuffalo/x v0.0.0-20181025192250-1ef645d63fe8 github.com/gorilla/context v1.1.1 @@ -44,13 +44,13 @@ require ( github.com/markbates/sigtx v1.0.0 github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba github.com/pkg/errors v0.8.0 - github.com/sirupsen/logrus v1.1.1 + github.com/sirupsen/logrus v1.2.0 github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.3 github.com/spf13/viper v1.2.1 github.com/stretchr/testify v1.2.2 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f - golang.org/x/tools v0.0.0-20181030151751-bb28844c46df + golang.org/x/tools v0.0.0-20181102050050-92b943e6bff7 gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4 ) diff --git a/go.sum b/go.sum index 58bd11484..b043d4c4a 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,5 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f h1:zvClvFQwU++UpIUBGC8YmDlfhUrweEy1R1Fj1gu5iIM= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= @@ -22,7 +21,6 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/structs v1.0.0 h1:BrX964Rv5uQ3wwS+KRUAJCBBw5PQmgJfJ6v4yly5QwU= github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= @@ -43,20 +41,16 @@ github.com/gobuffalo/buffalo-plugins v1.5.1/go.mod h1:jbmwSZK5+PiAP9cC09VQOrGMZF github.com/gobuffalo/buffalo-plugins v1.6.1/go.mod h1:/XZt7UuuDnx5P4v3cStK0+XoYiNOA2f0wDIsm1oLJQA= github.com/gobuffalo/buffalo-plugins v1.6.4/go.mod h1:/+N1aophkA2jZ1ifB2O3Y9yGwu6gKOVMtUmJnbg+OZI= github.com/gobuffalo/buffalo-plugins v1.6.5/go.mod h1:0HVkbgrVs/MnPZ/FOseDMVanCTm2RNcdM0PuXcL1NNI= -github.com/gobuffalo/buffalo-plugins v1.6.6 h1:wp+8CtKBAI8mh1LYe/MO0eK95EK52VNFZE+FrwJhBTU= github.com/gobuffalo/buffalo-plugins v1.6.6/go.mod h1:hSWAEkJyL9RENJlmanMivgnNkrQ9RC4xJARz8dQryi0= github.com/gobuffalo/buffalo-plugins v1.6.7 h1:tJYklFrGg/+8uz8eZ/DbOBzgsdJMT/aBOx2oACO0ylQ= github.com/gobuffalo/buffalo-plugins v1.6.7/go.mod h1:ZGZRkzz2PiKWHs0z7QsPBOTo2EpcGRArMEym6ghKYgk= github.com/gobuffalo/buffalo-pop v1.0.5/go.mod h1:Fw/LfFDnSmB/vvQXPvcXEjzP98Tc+AudyNWUBWKCwQ8= github.com/gobuffalo/buffalo-pop v1.1.2/go.mod h1:czNLXcYbg5/fjr+uht0NyjZaQ0V2W23H1jzyORgCzQ4= -github.com/gobuffalo/buffalo-pop v1.1.5 h1:IYHfo/xIAdjYJtb69j0aho4suNZ5zARnVJHYhnGyEBI= github.com/gobuffalo/buffalo-pop v1.1.5/go.mod h1:H01JIg42XwOHS4gRMhSeDZqBovNVlfBUsVXckU617s4= -github.com/gobuffalo/buffalo-pop v1.1.7 h1:UvCByjWg8Cq6xqK4mqFcfUsSFHGnE5IkWPriiFVAaqQ= -github.com/gobuffalo/buffalo-pop v1.1.7/go.mod h1:woGDIWRAzuU9FjrJX+NkQlfpHzFkJokv6UMabGtRYZE= +github.com/gobuffalo/buffalo-pop v1.1.8 h1:HVx6kuZG8C+5KcFG1lU2GOV8JEb6SQ+uzMEB0NYhV2o= +github.com/gobuffalo/buffalo-pop v1.1.8/go.mod h1:1uaxOFzzVud/zR5f1OEBr21tMVLQS3OZpQ1A5cr0svE= github.com/gobuffalo/envy v1.6.4/go.mod h1:Abh+Jfw475/NWtYMEt+hnJWRiC8INKWibIMyNt1w2Mc= -github.com/gobuffalo/envy v1.6.5 h1:X3is06x7v0nW2xiy2yFbbIjwHz57CD6z6MkvqULTCm8= github.com/gobuffalo/envy v1.6.5/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ= -github.com/gobuffalo/envy v1.6.6 h1:QTIrr8kp0NBhJsjwP04jSnuXB2u6QDJVwESVuFiQWUY= github.com/gobuffalo/envy v1.6.6/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ= github.com/gobuffalo/envy v1.6.7 h1:XMZGuFqTupAXhZTriQ+qO38QvNOSU/0rl3hEPCFci/4= github.com/gobuffalo/envy v1.6.7/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ= @@ -69,10 +63,10 @@ github.com/gobuffalo/events v1.1.4/go.mod h1:09/YRRgZHEOts5Isov+g9X2xajxdvOAcUuA github.com/gobuffalo/events v1.1.5 h1:bqxUVNdEmVDbR0TzF/np02/44TB6HGwdO5gwd+Z2pBo= github.com/gobuffalo/events v1.1.5/go.mod h1:3YUSzgHfYctSjEjLCWbkXP6djH2M+MLaVRzb4ymbAK0= github.com/gobuffalo/fizz v1.0.12/go.mod h1:C0sltPxpYK8Ftvf64kbsQa2yiCZY4RZviurNxXdAKwc= -github.com/gobuffalo/fizz v1.0.15 h1:v3bSXfic0kSMb4WHC1Gj7g55p7z5RueaoJHjEgQEko0= github.com/gobuffalo/fizz v1.0.15/go.mod h1:EI3mEpjImuji6Bwu++N2uXhljQwOhwtimZQJ89zwyF4= +github.com/gobuffalo/fizz v1.0.16 h1:IlpRBALMJdOfAo10+fcwO1AGmbZ5eOxqTNtY4ri5JuY= +github.com/gobuffalo/fizz v1.0.16/go.mod h1:EI3mEpjImuji6Bwu++N2uXhljQwOhwtimZQJ89zwyF4= github.com/gobuffalo/flect v0.0.0-20180907193754-dc14d8acaf9f/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA= -github.com/gobuffalo/flect v0.0.0-20181002182613-4571df4b1daf h1:xYv6IOKslpJv0cj82PT2YG2ZW8jbjRj8Fl9dvA6x0j4= github.com/gobuffalo/flect v0.0.0-20181002182613-4571df4b1daf/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA= github.com/gobuffalo/flect v0.0.0-20181007231023-ae7ed6bfe683/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA= github.com/gobuffalo/flect v0.0.0-20181018182602-fd24a256709f/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA= @@ -87,14 +81,11 @@ github.com/gobuffalo/genny v0.0.0-20181012161047-33e5f43d83a6/go.mod h1:+oG5Ljrw github.com/gobuffalo/genny v0.0.0-20181017160347-90a774534246/go.mod h1:+oG5Ljrw04czAHbPXREwaFojJbpUvcIy4DiOnbEJFTA= github.com/gobuffalo/genny v0.0.0-20181019144442-df0a36fdd146/go.mod h1:IyRrGrQb/sbHu/0z9i5mbpZroIsdxjCYfj+zFiFiWZQ= github.com/gobuffalo/genny v0.0.0-20181024195656-51392254bf53/go.mod h1:o9GEH5gn5sCKLVB5rHFC4tq40rQ3VRUzmx6WwmaqISE= -github.com/gobuffalo/genny v0.0.0-20181025145300-af3f81d526b8 h1:M7uY9cCZdF3M/I7a+dPAkIkbW3+binIDyWyuBPqvSuU= github.com/gobuffalo/genny v0.0.0-20181025145300-af3f81d526b8/go.mod h1:uZ1fFYvdcP8mu0B/Ynarf6dsGvp7QFIpk/QACUuFUVI= -github.com/gobuffalo/genny v0.0.0-20181027191429-94d6cfb5c7fc h1:x3rqyxKR5nYVioAjvnLSI3RoLkQ7WAiG4/NKC0zHVG4= github.com/gobuffalo/genny v0.0.0-20181027191429-94d6cfb5c7fc/go.mod h1:x7SkrQQBx204Y+O9EwRXeszLJDTaWN0GnEasxgLrQTA= github.com/gobuffalo/genny v0.0.0-20181030163439-ed103521b8ec h1:YCBMw2NhpfDyPgji/ApilErSUvvlnGuwG87Qw3pyh+4= github.com/gobuffalo/genny v0.0.0-20181030163439-ed103521b8ec/go.mod h1:3Xm9z7/2oRxlB7PSPLxvadZ60/0UIek1YWmcC7QSaVs= github.com/gobuffalo/github_flavored_markdown v1.0.4/go.mod h1:uRowCdK+q8d/RF0Kt3/DSalaIXbb0De/dmTqMQdkQ4I= -github.com/gobuffalo/github_flavored_markdown v1.0.5 h1:YvGVf7yj1akgsb+qc64Q0WX8uhpuZSibChbqOMRSAqE= github.com/gobuffalo/github_flavored_markdown v1.0.5/go.mod h1:U0643QShPF+OF2tJvYNiYDLDGDuQmJZXsf/bHOJPsMY= github.com/gobuffalo/github_flavored_markdown v1.0.7 h1:Vjvz4wqOnviiLEfTh5bh270b3lhpJiwwQEWOWmHMwY8= github.com/gobuffalo/github_flavored_markdown v1.0.7/go.mod h1:w93Pd9Lz6LvyQXEG6DktTPHkOtCbr+arAD5mkwMzXLI= @@ -102,9 +93,7 @@ github.com/gobuffalo/httptest v1.0.2 h1:LWp2khlgA697h4BIYWW2aRxvB93jMnBrbakQ/r2K github.com/gobuffalo/httptest v1.0.2/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= github.com/gobuffalo/licenser v0.0.0-20180924033006-eae28e638a42/go.mod h1:Ubo90Np8gpsSZqNScZZkVXXAo5DGhTb+WYFIjlnog8w= github.com/gobuffalo/licenser v0.0.0-20181025145548-437d89de4f75/go.mod h1:x3lEpYxkRG/XtGCUNkio+6RZ/dlOvLzTI9M1auIwFcw= -github.com/gobuffalo/logger v0.0.0-20181022175615-46cfb361fc27 h1:e+2mR5G4maCC4C/ZF2UuYe7mBxyimbDjUuVmhxesr8s= github.com/gobuffalo/logger v0.0.0-20181022175615-46cfb361fc27/go.mod h1:8sQkgyhWipz1mIctHF4jTxmJh1Vxhp7mP8IqbljgJZo= -github.com/gobuffalo/logger v0.0.0-20181027144941-73d08d2bb969 h1:QgazoAN+Ajn3cIMjgUx7tju5lhoWlLOdTSm35VxCr1Y= github.com/gobuffalo/logger v0.0.0-20181027144941-73d08d2bb969/go.mod h1:7uGg2duHKpWnN4+YmyKBdLXfhopkAdVM6H3nKbyFbz8= github.com/gobuffalo/logger v0.0.0-20181027193913-9cf4dd0efe46 h1:HDEkWXBE0WLewULQsZtjTx5GQTCa414QJWTm2+96kdA= github.com/gobuffalo/logger v0.0.0-20181027193913-9cf4dd0efe46/go.mod h1:7uGg2duHKpWnN4+YmyKBdLXfhopkAdVM6H3nKbyFbz8= @@ -118,7 +107,6 @@ github.com/gobuffalo/meta v0.0.0-20181018192820-8c6cef77dab3/go.mod h1:E94EPzx9N github.com/gobuffalo/meta v0.0.0-20181025145500-3a985a084b0a h1:kROH1vRfBoxH1QIQjINB4qi4TmQTdg2Z/yzrKq1f2qM= github.com/gobuffalo/meta v0.0.0-20181025145500-3a985a084b0a/go.mod h1:YDAKBud2FP7NZdruCSlmTmDOZbVSa6bpK7LJ/A/nlKg= github.com/gobuffalo/mw-basicauth v1.0.3/go.mod h1:dg7+ilMZOKnQFHDefUzUHufNyTswVUviCBgF244C1+0= -github.com/gobuffalo/mw-basicauth v1.0.6 h1:dj8+I8wgfz9klZGzA1+EOax3xUkd3A7a5rur4Z3HpGo= github.com/gobuffalo/mw-basicauth v1.0.6/go.mod h1:RFyeGeDLZlVgp/eBflqu2eavFqyv0j0fVVP87WPYFwY= github.com/gobuffalo/mw-basicauth v1.0.7 h1:9zTxCpu0ozzwpwvw5MO31w8nEoySNRNfZwM1YAWfGZs= github.com/gobuffalo/mw-basicauth v1.0.7/go.mod h1:xJ9/OSiOWl+kZkjaSun62srODr3Cx8OB4AKr+G4FlS4= @@ -128,7 +116,6 @@ github.com/gobuffalo/mw-csrf v0.0.0-20180802151833-446ff26e108b h1:A13B4mhcFQcjP github.com/gobuffalo/mw-csrf v0.0.0-20180802151833-446ff26e108b/go.mod h1:sbGtb8DmDZuDUQoxjr8hG1ZbLtZboD9xsn6p77ppcHo= github.com/gobuffalo/mw-forcessl v0.0.0-20180802152810-73921ae7a130 h1:v94+IGhlBro0Lz1gOR3lrdAVSZ0mJF2NxsdppKd7FnI= github.com/gobuffalo/mw-forcessl v0.0.0-20180802152810-73921ae7a130/go.mod h1:JvNHRj7bYNAMUr/5XMkZaDcw3jZhUZpsmzhd//FFWmQ= -github.com/gobuffalo/mw-i18n v0.0.0-20180802152014-e3060b7e13d6 h1:pZhsgF8RXEngHdibuRNOXNk1pL0K9rFa5HOcvURNTQ4= github.com/gobuffalo/mw-i18n v0.0.0-20180802152014-e3060b7e13d6/go.mod h1:91AQfukc52A6hdfIfkxzyr+kpVYDodgAeT5cjX1UIj4= github.com/gobuffalo/mw-i18n v0.0.0-20181027200759-09e0c99be4d3 h1:ACN4mEXAmv7u1H8niLxZOzuKymMj5rvBmZqShrXOVf0= github.com/gobuffalo/mw-i18n v0.0.0-20181027200759-09e0c99be4d3/go.mod h1:1PpGPgqP8VsfUppgBA9FrTOXjI6X9gjqhh/8dmg48lg= @@ -137,49 +124,40 @@ github.com/gobuffalo/mw-paramlogger v0.0.0-20181005191442-d6ee392ec72e/go.mod h1 github.com/gobuffalo/mw-tokenauth v0.0.0-20181001105134-8545f626c189 h1:nhPzONHNGlXZIMFfKm6cWpRSq5oTanRK1qBtfCPBFyE= github.com/gobuffalo/mw-tokenauth v0.0.0-20181001105134-8545f626c189/go.mod h1:UqBF00IfKvd39ni5+yI5MLMjAf4gX7cDKN/26zDOD6c= github.com/gobuffalo/packd v0.0.0-20181027182251-01ad393492c8/go.mod h1:SmdBdhj6uhOsg1Ui4SFAyrhuc7U4VCildosO5IDJ3lc= -github.com/gobuffalo/packd v0.0.0-20181027190505-aafc0d02c411 h1:WQcoUsj99eguxjQg7LsWVXurBrHLKXiS0cHhmKlb5Do= github.com/gobuffalo/packd v0.0.0-20181027190505-aafc0d02c411/go.mod h1:SmdBdhj6uhOsg1Ui4SFAyrhuc7U4VCildosO5IDJ3lc= -github.com/gobuffalo/packd v0.0.0-20181027194105-7ae579e6d213 h1:aEF3yscKSe+wesROAo0CR05oKCXbATA88gmhM+Dibro= github.com/gobuffalo/packd v0.0.0-20181027194105-7ae579e6d213/go.mod h1:SmdBdhj6uhOsg1Ui4SFAyrhuc7U4VCildosO5IDJ3lc= github.com/gobuffalo/packd v0.0.0-20181028162033-6d52e0eabf41/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= -github.com/gobuffalo/packd v0.0.0-20181029140631-cf76bd87a5a6 h1:qyhnjK1xyp4xqyP12n8vBQDRgZe6fOXkITcCxN9zX2o= github.com/gobuffalo/packd v0.0.0-20181029140631-cf76bd87a5a6/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= -github.com/gobuffalo/packr v1.13.7 h1:2uZgLd6b/W4yRBZV/ScaORxZLNGMHO0VCvqQNkKukNA= +github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264 h1:roWyi0eEdiFreSqW9V1wT9pNOVzrpo2NWsxja53slX0= +github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= github.com/gobuffalo/packr v1.13.7/go.mod h1:KkinLIn/n6+3tVXMwg6KkNvWwVsrRAz4ph+jgpk3Z24= -github.com/gobuffalo/packr v1.15.0 h1:vGC4QlaqKPhdbaI4RTno510fmb5/5PKKSfFFGwnXu2o= github.com/gobuffalo/packr v1.15.0/go.mod h1:t5gXzEhIviQwVlNx/+3SfS07GS+cZ2hn76WLzPp6MGI= -github.com/gobuffalo/packr v1.15.1 h1:aMdHztLZ108kXSobbhAZ5qVd0tiTyx+J0AgZpBVkplY= github.com/gobuffalo/packr v1.15.1/go.mod h1:IeqicJ7jm8182yrVmNbM6PR4g79SjN9tZLH8KduZZwE= -github.com/gobuffalo/packr v1.16.0 h1:s0cqMbFDbio+Z3YxLeDOKRjLW2JKh9QVud0O7+j1fiQ= github.com/gobuffalo/packr v1.16.0/go.mod h1:Yx/lcR/7mDLXhuJSzsz2MauD/HUwSc+EK6oigMRGGsM= +github.com/gobuffalo/packr v1.17.0 h1:6Rq0rZ9eYj/bvQORaejrX7MVfE50FCxDwK1+lxZ12Ms= +github.com/gobuffalo/packr v1.17.0/go.mod h1:sCe/viXJlq3qi5ThqmjhoB3sb1u4hp7Y0VhEiGUILwQ= github.com/gobuffalo/plush v3.7.16+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= -github.com/gobuffalo/plush v3.7.20+incompatible h1:FgLKw/zwd8IY8lAqfSuVNuHopR7jKVSs6yjJKeBajzU= github.com/gobuffalo/plush v3.7.20+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= -github.com/gobuffalo/plush v3.7.21+incompatible h1:P22trrg5gJPWD80exgn6JuFdI/FTComjYIfBJDxxaA8= github.com/gobuffalo/plush v3.7.21+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= +github.com/gobuffalo/plush v3.7.22+incompatible h1:SJxTrFxizR3wCxb7GOYf1ZUjo3mfAczK4B/FYROZg00= +github.com/gobuffalo/plush v3.7.22+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= github.com/gobuffalo/pop v4.8.2+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/pop v4.8.3+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/pop v4.8.4+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= -github.com/gobuffalo/pop v4.8.5+incompatible h1:Kh4ayqg2UkZ7RUApd8Bk0BYT7YwbOPa2OA7rKVQC+RU= github.com/gobuffalo/pop v4.8.5+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= -github.com/gobuffalo/pop v4.8.6+incompatible h1:BspvX5mStyNfTcuzeLwo9JayfUlFGYNpCZiWu3Z+yRM= -github.com/gobuffalo/pop v4.8.6+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= -github.com/gobuffalo/pop v4.8.7+incompatible h1:7bz+04Din1PbJtFRyEy8bogvEeUa6t273H6xgr+D1bQ= github.com/gobuffalo/pop v4.8.7+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= +github.com/gobuffalo/pop v4.8.8+incompatible h1:att8VCpyFCwEghYseiPqYcxOEh9TjL+DgM2WyKTTrNg= +github.com/gobuffalo/pop v4.8.8+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/release v1.0.35/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4= github.com/gobuffalo/release v1.0.38/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4= github.com/gobuffalo/release v1.0.42/go.mod h1:RPs7EtafH4oylgetOJpGP0yCZZUiO4vqHfTHJjSdpug= github.com/gobuffalo/release v1.0.51/go.mod h1:RPs7EtafH4oylgetOJpGP0yCZZUiO4vqHfTHJjSdpug= github.com/gobuffalo/release v1.0.52/go.mod h1:RPs7EtafH4oylgetOJpGP0yCZZUiO4vqHfTHJjSdpug= -github.com/gobuffalo/release v1.0.53 h1:ajY8NlpjKAk/xfyWF5zT5q5UDD5sduF+wG+vRo/ZR+g= github.com/gobuffalo/release v1.0.53/go.mod h1:FdF257nd8rqhNaqtDWFGhxdJ/Ig4J7VcS3KL7n/a+aA= -github.com/gobuffalo/release v1.0.54 h1:Xi34paagDO7o+C4dNwq3wXueY4hWjMRpsGjVPjvVmAA= github.com/gobuffalo/release v1.0.54/go.mod h1:Pe5/RxRa/BE8whDpGfRqSI7D1a0evGK1T4JDm339tJc= -github.com/gobuffalo/shoulders v1.0.1 h1:BqVJBUXlBWAf+WLhXijVk3SCpp75LXrVBiIkOCzZbNc= github.com/gobuffalo/shoulders v1.0.1/go.mod h1:V33CcVmaQ4gRUmHKwq1fiTXuf8Gp/qjQBUL5tHPmvbA= github.com/gobuffalo/tags v2.0.11+incompatible h1:zLkaontB8lWefU+DX38mzPLRKFGTJL8FKb9JnKMt0Z0= github.com/gobuffalo/tags v2.0.11+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY= -github.com/gobuffalo/uuid v2.0.3+incompatible h1:W83ymTRbzM+XNntIsjC8j63FyzGytcfKTudU1Cg6xyk= github.com/gobuffalo/uuid v2.0.3+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE= github.com/gobuffalo/uuid v2.0.4+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE= github.com/gobuffalo/uuid v2.0.5+incompatible h1:c5uWRuEnYggYCrT9AJm0U2v1QTG7OVDAvxhj8tIV5Gc= @@ -188,7 +166,6 @@ github.com/gobuffalo/validate v2.0.3+incompatible h1:6f4JCEz11Zi6iIlexMv7Jz10RBP github.com/gobuffalo/validate v2.0.3+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM= github.com/gobuffalo/x v0.0.0-20181003152136-452098b06085/go.mod h1:WevpGD+5YOreDJznWevcn8NTmQEW5STSBgIkpkjzqXc= github.com/gobuffalo/x v0.0.0-20181007152206-913e47c59ca7/go.mod h1:9rDPXaB3kXdKWzMc4odGQQdG2e2DIEmANy5aSJ9yesY= -github.com/gobuffalo/x v0.0.0-20181025165825-f204f550da9d h1:PefQoCTt9y8+3Yv3XWcoh7r+w97vICB1ryJ6jHwkO9E= github.com/gobuffalo/x v0.0.0-20181025165825-f204f550da9d/go.mod h1:Qh2Pb/Ak1Ko2mzHlGPigrnxkhO4WTTCI1jJM58sbgtE= github.com/gobuffalo/x v0.0.0-20181025192250-1ef645d63fe8 h1:ZPxa+We/R9244fmxNvDVeTvnF/RKDMk+ch3XD6Zp02o= github.com/gobuffalo/x v0.0.0-20181025192250-1ef645d63fe8/go.mod h1:AIlnMGlYXOCsoCntLPFLYtrJNS/pc2HD4IdSXH62TpU= @@ -241,26 +218,22 @@ github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/markbates/deplist v1.0.4 h1:iB69njAsGAoJ3Yw8kjTFeKzR/cDVGmSkg9pIFgnkcLc= github.com/markbates/deplist v1.0.4/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM= github.com/markbates/deplist v1.0.5 h1:BKTJDTV5EynLGvTyONdgYVvV34DWq20mJAfGBCP+AYs= github.com/markbates/deplist v1.0.5/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM= github.com/markbates/going v1.0.2 h1:uNQHDDfMRNOUmuxDbPbvatyw4wr4UOSUZkGkdkcip1o= github.com/markbates/going v1.0.2/go.mod h1:UWCk3zm0UKefHZ7l8BNqi26UyiEMniznk8naLdTcy6c= -github.com/markbates/grift v1.0.4 h1:JjTyhlgPtgEnyHNvVn5lk21zWQbWD3cGE0YdyvvbZYg= github.com/markbates/grift v1.0.4/go.mod h1:wbmtW74veyx+cgfwFhlnnMWqhoz55rnHR47oMXzsyVs= github.com/markbates/grift v1.0.5 h1:GUHfm1Jb0ETaWcvvo9eESoqonnzM7DfcUn+5R/W9XNI= github.com/markbates/grift v1.0.5/go.mod h1:EHmVIjOQoj/OOBDzlZ8RW0ZkvOtQ4xRHjrPvmfoiFaU= github.com/markbates/hmax v1.0.0 h1:yo2N0gBoCnUMKhV/VRLHomT6Y9wUm+oQQENuWJqCdlM= github.com/markbates/hmax v1.0.0/go.mod h1:cOkR9dktiESxIMu+65oc/r/bdY4bE8zZw3OLhLx0X2c= github.com/markbates/inflect v1.0.0/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88= -github.com/markbates/inflect v1.0.1 h1:t3WOiMLsNqn0Vvw87evC70WSawzHZcwMETn53rL1bBw= github.com/markbates/inflect v1.0.1/go.mod h1:uv3UVNBe5qBIfCm8O8Q+DW+S1EopeyINj+Ikhc7rnCk= github.com/markbates/inflect v1.0.3/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs= github.com/markbates/inflect v1.0.4 h1:5fh1gzTFhfae06u3hzHYO9xe3l3v3nW5Pwt3naLTP5g= github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs= github.com/markbates/oncer v0.0.0-20180924031910-e862a676800b/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/oncer v0.0.0-20180924034138-723ad0170a46 h1:hE7AFWf+YsdjT67d8uMxhirH3FG5Up2ovbwFWjamdt4= github.com/markbates/oncer v0.0.0-20180924034138-723ad0170a46/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4 h1:Mlji5gkcpzkqTROyE4ZxZ8hN7osunMb2RuGVrbvMvCc= github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= @@ -278,7 +251,6 @@ github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRU github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -314,30 +286,23 @@ github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt3d2aYa0SiNms/hFqC9qJYolM= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b h1:vYEG87HxbU6dXj5npkeulCS96Dtz5xg3jcfCgpcvbIw= github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= -github.com/shurcooL/highlight_go v0.0.0-20170515013102-78fb10f4a5f8 h1:xLQlo0Ghg8zBaQi+tjpK+z/WLjbg/BhAWP9pYgqo/LQ= github.com/shurcooL/highlight_go v0.0.0-20170515013102-78fb10f4a5f8/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= -github.com/shurcooL/octicon v0.0.0-20180602230221-c42b0e3b24d9 h1:j3cAp1j8k/tSLaCcDiXIpVJ8FzSJ9g1eeOAPRJYM75k= github.com/shurcooL/octicon v0.0.0-20180602230221-c42b0e3b24d9/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= -github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY= github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/sirupsen/logrus v1.1.0 h1:65VZabgUiV9ktjGM5nTq0+YurgTyX+YI2lSSfDjI+qU= github.com/sirupsen/logrus v1.1.0/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A= -github.com/sirupsen/logrus v1.1.1 h1:VzGj7lhU7KEB9e9gMpAV/v5XT2NVSvLJhJLCWbnkgXg= github.com/sirupsen/logrus v1.1.1/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A= +github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d h1:yKm7XZV6j9Ev6lojP2XaIshpT4ymkqhMeSghO5Ps00E= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG93cPwA5f7s/ZPBJnGOYQNK/vKsaDaseuKT5Asee8= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg= github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -350,6 +315,7 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.2.1 h1:bIcUwXqLseLF3BDAZduuNfekWG87ibtFxi59Bq+oI9M= github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA= @@ -358,14 +324,11 @@ github.com/unrolled/secure v0.0.0-20181022170031-4b6b7cf51606 h1:dU9yXzNi9rl6Mou github.com/unrolled/secure v0.0.0-20181022170031-4b6b7cf51606/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4 h1:Vk3wNqEZwyGyei9yq5ekj7frek2u7HUfffJ1/opblzc= golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181024171144-74cb1d3d52f4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181025113841-85e1b3f9139a h1:Pg1/+l4/QV6z7N506eGnLiJ/Rl4IJf1FwYQKvP51OjA= golang.org/x/crypto v0.0.0-20181025113841-85e1b3f9139a/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 h1:a4tQYYYuK9QdeO/+kEvNYyuR21S+7ve5EANok6hABhI= golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 h1:y6ce7gCWtnH+m3dCjzQ1PCuwl28DDIc3VNnvY29DlIA= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -374,11 +337,9 @@ golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180921000356-2f5d2388922f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181017193950-04a2e542c03f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519 h1:x6rhz8Y9CjbgQkccRGmELH6K+LJj7tOoh3XWeC1yaQM= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181029044818-c44066c5c816 h1:mVFkLpejdFLXVUv9E42f3XJVfMdqd0IVLVIVLjZWn5o= golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -390,17 +351,13 @@ golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180921163948-d47a0f339242/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180927150500-dad3d9fb7b6e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0= golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181011152604-fa43e7bc11ba h1:nZJIJPGow0Kf9bU9QTc1U6OXbs/7Hu4e+cNv+hxH+Zc= golang.org/x/sys v0.0.0-20181011152604-fa43e7bc11ba/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181019084534-8f1d3d21f81b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181022134430-8a28ead16f52/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181025063200-d989b31c8746 h1:zTiiIq2XH/ldZGPA59ILL7NbDlz/btn3iJvO7H57mY8= golang.org/x/sys v0.0.0-20181025063200-d989b31c8746/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026064943-731415f00dce/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5 h1:x6r4Jo0KNzOOzYd8lbcRsqjuqEASK6ob3auvWYM4/8U= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181030150119-7e31e0c00fa0 h1:biUuj9O+0+XckRUCDzjoOGm6yFV5c0IHbm1ODP3e4Zw= golang.org/x/sys v0.0.0-20181030150119-7e31e0c00fa0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -408,18 +365,16 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181003024731-2f84ea8ef872/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181006002542-f60d9635b16a h1:2clmXmw4YommCu+v1MdCr87N191PLYU6hJ0m74ZFiCo= golang.org/x/tools v0.0.0-20181006002542-f60d9635b16a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181008205924-a2b3f7f249e9/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181013182035-5e66757b835f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181017214349-06f26fdaaa28/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181019005945-6adeb8aab2de/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181024171208-a2dc47679d30 h1:iZIABIEHjQFp5zqGZgQiaXi5Ue5czJhXyylr2CTtdRY= golang.org/x/tools v0.0.0-20181024171208-a2dc47679d30/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181026183834-f60e5f99f081 h1:QJP9sxq2/KbTxFnGduVryxJOt6r/UVGyom3tLaqu7tc= golang.org/x/tools v0.0.0-20181026183834-f60e5f99f081/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030151751-bb28844c46df h1:4+Wruypv9iYfX2bCPjBhtI9LGtloGYdPA9n9iLjaS7I= golang.org/x/tools v0.0.0-20181030151751-bb28844c46df/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181102050050-92b943e6bff7 h1:BdbtPv/+DFTRA5+9560n/FamYyleF+XonScH/3H1+Tk= +golang.org/x/tools v0.0.0-20181102050050-92b943e6bff7/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= google.golang.org/appengine v1.2.0 h1:S0iUepdCWODXRvtE+gcRDd15L+k+k1AiHlMiMjefH24= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= diff --git a/render/js.go b/render/js.go index 24ff8c057..9a8d5c565 100644 --- a/render/js.go +++ b/render/js.go @@ -1,11 +1,8 @@ package render import ( - "html/template" - "strings" - "github.com/gobuffalo/plush" - "github.com/pkg/errors" + "github.com/markbates/oncer" ) // JavaScript renders the named files using the 'application/javascript' @@ -41,28 +38,8 @@ func (e *Engine) JavaScript(names ...string) Renderer { } // JSTemplateEngine renders files with a `.js` extension through Plush. -// It also implements a new `partial` helper that will run non-JS partials -// through `JSEscapeString` before injecting. +// Deprecated: use github.com/gobuffalo/plush.BuffaloRenderer instead. func JSTemplateEngine(input string, data map[string]interface{}, helpers map[string]interface{}) (string, error) { - var pf partFunc - var ok bool - if pf, ok = helpers["partial"].(func(string, Data) (template.HTML, error)); !ok { - return "", errors.New("could not find a partial function") - } - - helpers["partial"] = func(name string, dd Data) (template.HTML, error) { - if strings.Contains(name, ".js") { - return pf(name, dd) - } - h, err := pf(name, dd) - if err != nil { - return "", errors.WithStack(err) - } - he := template.JSEscapeString(string(h)) - return template.HTML(he), nil - } - + oncer.Deprecate(0, "render.JSTemplateEngine", "Use github.com/gobuffalo/plush.BuffaloRenderer instead.") return plush.BuffaloRenderer(input, data, helpers) } - -type partFunc func(string, Data) (template.HTML, error) diff --git a/render/js_test.go b/render/js_test.go index 1f6c7d84d..c03a66339 100644 --- a/render/js_test.go +++ b/render/js_test.go @@ -1,4 +1,4 @@ -package render_test +package render import ( "bytes" @@ -8,7 +8,6 @@ import ( "strings" "testing" - "github.com/gobuffalo/buffalo/render" "github.com/gobuffalo/packr" "github.com/stretchr/testify/require" ) @@ -30,7 +29,7 @@ func Test_JavaScript(t *testing.T) { t.Run("without a layout", func(st *testing.T) { r := require.New(st) - j := render.New(render.Options{ + j := New(Options{ TemplatesBox: packr.NewBox(tmpDir), }).JavaScript @@ -51,7 +50,7 @@ func Test_JavaScript(t *testing.T) { _, err = layout.Write([]byte("<%= yield %>")) r.NoError(err) - re := render.New(render.Options{ + re := New(Options{ JavaScriptLayout: filepath.Base(layout.Name()), TemplatesBox: packr.NewBox(tmpDir), }) @@ -94,7 +93,7 @@ func Test_JavaScript_JS_Partial(t *testing.T) { r.NoError(err) defer os.RemoveAll(dir) - re := render.New(render.Options{ + re := New(Options{ TemplatesBox: packr.NewBox(dir), }) @@ -115,6 +114,26 @@ func Test_JavaScript_JS_Partial(t *testing.T) { r.Equal("let a = 1;\nalert('hi!');", bb.String()) } +func Test_JavaScript_JS_Partial_Without_Extension(t *testing.T) { + r := require.New(t) + + const testJS = "let a = 1;\n<%= partial(\"part\") %>" + const partJS = "alert('Hi <%= name %>!');" + + err := withHTMLFile("test.js", testJS, func(e *Engine) { + err := withHTMLFile("_part.js", partJS, func(e *Engine) { + bb := &bytes.Buffer{} + renderer := e.JavaScript("test.js") + r.Equal("application/javascript", renderer.ContentType()) + err := renderer.Render(bb, Data{"name": "Yonghwan"}) + r.NoError(err) + r.Equal("let a = 1;\nalert('Hi Yonghwan!');", bb.String()) + }) + r.NoError(err) + }) + r.NoError(err) +} + func Test_JavaScript_HTML_Partial(t *testing.T) { r := require.New(t) @@ -122,7 +141,7 @@ func Test_JavaScript_HTML_Partial(t *testing.T) { r.NoError(err) defer os.RemoveAll(dir) - re := render.New(render.Options{ + re := New(Options{ TemplatesBox: packr.NewBox(dir), }) diff --git a/render/partials_test.go b/render/partials_test.go index 95fe9ebba..bd6dd2f7c 100644 --- a/render/partials_test.go +++ b/render/partials_test.go @@ -75,6 +75,60 @@ func Test_Template_Partial_Form(t *testing.T) { } +func Test_Template_Partial_With_For(t *testing.T) { + r := require.New(t) + + const forHTML = `<%= for(user) in users { %><%= partial("row") %><% } %>` + const rowHTML = `Hi <%= user.Name %>, ` + const result = `Hi Mark, Hi Yonghwan,` + + users := []struct { + Name string + }{{Name: "Mark"}, {Name: "Yonghwan"}} + + err := withHTMLFile("for.html", forHTML, func(e *Engine) { + err := withHTMLFile("_row.html", rowHTML, func(e *Engine) { + + re := e.Template("text/html; charset=utf-8", "for.html") + bb := &bytes.Buffer{} + err := re.Render(bb, Data{"users": users}) + r.NoError(err) + r.Equal(result, strings.TrimSpace(bb.String())) + + }) + r.NoError(err) + }) + r.NoError(err) + +} + +func Test_Template_Partial_With_For_And_Local(t *testing.T) { + r := require.New(t) + + const forHTML = `<%= for(user) in users { %><%= partial("row", {say:"Hi"}) %><% } %>` + const rowHTML = `<%= say %> <%= user.Name %>, ` + const result = `Hi Mark, Hi Yonghwan,` + + users := []struct { + Name string + }{{Name: "Mark"}, {Name: "Yonghwan"}} + + err := withHTMLFile("for.html", forHTML, func(e *Engine) { + err := withHTMLFile("_row.html", rowHTML, func(e *Engine) { + + re := e.Template("text/html; charset=utf-8", "for.html") + bb := &bytes.Buffer{} + err := re.Render(bb, Data{"users": users}) + r.NoError(err) + r.Equal(result, strings.TrimSpace(bb.String())) + + }) + r.NoError(err) + }) + r.NoError(err) + +} + func Test_Template_Partial_Recursive_With_Global_And_Local_Context(t *testing.T) { r := require.New(t) diff --git a/render/render.go b/render/render.go index 1cbece885..2706dbfec 100644 --- a/render/render.go +++ b/render/render.go @@ -32,7 +32,7 @@ func New(opts Options) *Engine { opts.TemplateEngines["txt"] = plush.BuffaloRenderer } if _, ok := opts.TemplateEngines["js"]; !ok { - opts.TemplateEngines["js"] = JSTemplateEngine + opts.TemplateEngines["js"] = plush.BuffaloRenderer } if _, ok := opts.TemplateEngines["md"]; !ok { opts.TemplateEngines["md"] = MDTemplateEngine diff --git a/render/template.go b/render/template.go index 7a0eaa415..964cb3836 100644 --- a/render/template.go +++ b/render/template.go @@ -1,7 +1,6 @@ package render import ( - "fmt" "html/template" "io" "os" @@ -37,31 +36,7 @@ func (s *templateRenderer) Render(w io.Writer, data Data) error { return nil } -func (s templateRenderer) partial(name string, dd Data) (template.HTML, error) { - d, f := filepath.Split(name) - name = filepath.Join(d, "_"+f) - - if _, ok := dd["layout"]; ok { - - var body template.HTML - var err error - - body, err = s.exec(name, dd) - if err != nil { - return body, err - } - dd["yield"] = body - d, f := filepath.Split(fmt.Sprintf("%v", dd["layout"])) - name = filepath.Join(d, "_"+f) - - } - return s.exec(name, dd) -} - -func (s templateRenderer) exec(name string, data Data) (template.HTML, error) { - ct := strings.ToLower(s.contentType) - data["contentType"] = ct - +func fixExtension(name string, ct string) string { if filepath.Ext(name) == "" { switch { case strings.Contains(ct, "html"): @@ -72,6 +47,27 @@ func (s templateRenderer) exec(name string, data Data) (template.HTML, error) { name += ".md" } } + return name +} + +// partialFeeder returns template string for the name from `TemplateBox`. +// It should be registered as helper named `partialFeeder` so plush can +// find it with the name. +func (s templateRenderer) partialFeeder(name string) (string, error) { + ct := strings.ToLower(s.contentType) + + d, f := filepath.Split(name) + name = filepath.Join(d, "_"+f) + name = fixExtension(name, ct) + + return s.TemplatesBox.FindString(name) +} + +func (s templateRenderer) exec(name string, data Data) (template.HTML, error) { + ct := strings.ToLower(s.contentType) + data["contentType"] = ct + + name = fixExtension(name, ct) // Try to use localized version templateName := name @@ -103,24 +99,13 @@ func (s templateRenderer) exec(name string, data Data) (template.HTML, error) { data["current_template"] = templateName } - source, err := s.TemplatesBox.FindString(templateName) + source, err := s.TemplatesBox.Find(templateName) if err != nil { return "", err } helpers := map[string]interface{}{ - "partial": func(name string, dd Data) (template.HTML, error) { - // call the partial copying the current context data, - // and any new args, before calling the partial helper - m := Data{} - for k, v := range data { - m[k] = v - } - for k, v := range dd { - m[k] = v - } - return s.partial(name, m) - }, + "partialFeeder": s.partialFeeder, } helpers = s.addAssetsHelpers(helpers) @@ -129,19 +114,20 @@ func (s templateRenderer) exec(name string, data Data) (template.HTML, error) { helpers[k] = v } + body := string(source) for _, ext := range s.exts(name) { te, ok := s.TemplateEngines[ext] if !ok { logrus.Errorf("could not find a template engine for %s\n", ext) continue } - source, err = te(source, data, helpers) + body, err = te(body, data, helpers) if err != nil { return "", errors.Wrap(err, name) } } - return template.HTML(source), nil + return template.HTML(body), nil } func (s templateRenderer) exts(name string) []string { diff --git a/route_mappings.go b/route_mappings.go index 9bfbe7345..340305f55 100644 --- a/route_mappings.go +++ b/route_mappings.go @@ -3,6 +3,7 @@ package buffalo import ( "fmt" "net/http" + "net/url" "os" "path" "reflect" @@ -85,7 +86,9 @@ func (a *App) Mount(p string, h http.Handler) { func (a *App) ServeFiles(p string, root http.FileSystem) { path := path.Join(a.Prefix, p) a.filepaths = append(a.filepaths, path) - a.router.PathPrefix(path).Handler(http.StripPrefix(path, a.fileServer(root))) + + h := stripAsset(path, a.fileServer(root)) + a.router.PathPrefix(path).Handler(h) } func (a *App) fileServer(fs http.FileSystem) http.Handler { @@ -283,3 +286,23 @@ func (a *App) buildRouteName(p string) string { underscore := strings.TrimSpace(strings.Join(resultParts, "_")) return inflect.CamelizeDownFirst(underscore) } + +func stripAsset(path string, h http.Handler) http.Handler { + if path == "" { + return h + } + + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + up := r.URL.Path + up = strings.TrimPrefix(up, path) + up = strings.TrimSuffix(up, "/") + u, err := url.Parse(up) + if err != nil { + w.WriteHeader(500) + w.Write([]byte(err.Error())) + return + } + r.URL = u + h.ServeHTTP(w, r) + }) +} diff --git a/router_test.go b/router_test.go index fd5be300d..6383c2b5b 100644 --- a/router_test.go +++ b/router_test.go @@ -5,12 +5,12 @@ import ( "io/ioutil" "net/http" "path" - "path/filepath" "strings" "testing" "github.com/gobuffalo/buffalo/render" "github.com/gobuffalo/httptest" + "github.com/gobuffalo/packd" "github.com/gobuffalo/packr" "github.com/gorilla/mux" "github.com/stretchr/testify/require" @@ -321,21 +321,16 @@ func Test_Router_Redirect(t *testing.T) { func Test_Router_ServeFiles(t *testing.T) { r := require.New(t) - tmpFile, err := ioutil.TempFile("", "assets") - r.NoError(err) - - af := []byte("hi") - _, err = tmpFile.Write(af) - r.NoError(err) - + box := packd.NewMemoryBox() + box.AddString("foo.png", "foo") a := New(Options{}) - a.ServeFiles("/assets", http.Dir(filepath.Dir(tmpFile.Name()))) + a.ServeFiles("/assets", box) w := httptest.New(a) - res := w.HTML("/assets/%s", filepath.Base(tmpFile.Name())).Get() + res := w.HTML("/assets/foo.png").Get() r.Equal(200, res.Code) - r.Equal(af, res.Body.Bytes()) + r.Equal("foo", res.Body.String()) } func Test_App_NamedRoutes(t *testing.T) { @@ -677,8 +672,9 @@ func Test_Router_Matches_Trailing_Slash(t *testing.T) { {"/foo", "/foo/", "/foo/"}, {"/foo/", "/foo", "/foo/"}, {"/foo/", "/foo/", "/foo/"}, - {"/index.html", "/index.html", "/index.html"}, - {"/foo.gif", "/foo.gif", "/foo.gif"}, + {"/index.html", "/index.html", "/index.html/"}, + {"/foo.gif", "/foo.gif", "/foo.gif/"}, + {"/{img}", "/foo.png", "/foo.png/"}, } for _, tt := range table { diff --git a/runtime/version.go b/runtime/version.go index 86fb35860..42cff956c 100644 --- a/runtime/version.go +++ b/runtime/version.go @@ -1,4 +1,4 @@ package runtime // Version is the current version of the buffalo binary -const Version = "v0.13.3-alpha.1" +const Version = "development" diff --git a/server.go b/server.go index cecec94dc..54d3860f1 100644 --- a/server.go +++ b/server.go @@ -4,7 +4,6 @@ import ( "context" "net/http" "os" - "path/filepath" "strings" "syscall" @@ -155,9 +154,6 @@ func (a *App) processPreHandlers(res http.ResponseWriter, req *http.Request) boo } func (a *App) normalizePath(path string) string { - if filepath.Ext(path) != "" { - return path - } if strings.HasSuffix(path, "/") { return path }