From 03af855075434fcba92abfd0b21e8a0fc82a0cac Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Wed, 28 Dec 2016 20:52:20 -0500 Subject: [PATCH] moved to gobuffalo/buffalo --- CHANGELOG.md | 174 +++++++++--------- Dockerfile | 2 +- README.md | 4 +- SHOULDERS.md | 6 +- buffalo/cmd/app_generators.go | 16 +- buffalo/cmd/generate.go | 2 +- buffalo/cmd/generate/goth.go | 2 +- buffalo/cmd/generate/resource.go | 2 +- buffalo/cmd/version.go | 2 +- buffalo/main.go | 2 +- context.go | 2 +- default_context.go | 2 +- default_context_test.go | 2 +- examples/hello-world/actions/app.go | 2 +- examples/hello-world/actions/home.go | 2 +- examples/hello-world/actions/home_test.go | 2 +- examples/hello-world/actions/render.go | 4 +- examples/hello-world/grifts/routes.go | 2 +- examples/hello-world/main.go | 2 +- examples/html-crud/actions/actions_test.go | 2 +- examples/html-crud/actions/app.go | 6 +- examples/html-crud/actions/render.go | 4 +- examples/html-crud/actions/users.go | 4 +- examples/html-crud/actions/users_test.go | 4 +- examples/html-crud/grifts/db.go | 2 +- examples/html-crud/grifts/routes.go | 2 +- examples/html-crud/main.go | 2 +- .../html-resource/actions/actions_test.go | 2 +- examples/html-resource/actions/app.go | 6 +- examples/html-resource/actions/render.go | 4 +- examples/html-resource/actions/users.go | 4 +- examples/html-resource/actions/users_test.go | 4 +- examples/html-resource/grifts/db.go | 2 +- examples/html-resource/grifts/routes.go | 2 +- examples/html-resource/main.go | 2 +- examples/json-crud/actions/actions_test.go | 2 +- examples/json-crud/actions/app.go | 6 +- examples/json-crud/actions/users.go | 6 +- examples/json-crud/actions/users_test.go | 4 +- examples/json-crud/grifts/routes.go | 2 +- examples/json-crud/main.go | 2 +- .../json-resource/actions/actions_test.go | 2 +- examples/json-resource/actions/app.go | 6 +- examples/json-resource/actions/users.go | 6 +- examples/json-resource/actions/users_test.go | 4 +- examples/json-resource/grifts/routes.go | 2 +- examples/json-resource/main.go | 2 +- examples/simple_hello/main.go | 4 +- examples/websockets/actions/app.go | 2 +- examples/websockets/actions/home.go | 2 +- examples/websockets/actions/home_test.go | 2 +- examples/websockets/actions/render.go | 4 +- examples/websockets/actions/socket.go | 2 +- examples/websockets/grifts/routes.go | 2 +- examples/websockets/main.go | 2 +- grifts/release.go | 2 +- handler.go | 2 +- method_override_test.go | 2 +- middleware/content_type.go | 2 +- middleware/content_type_test.go | 6 +- middleware/new_relic.go | 2 +- middleware/pop_transaction.go | 2 +- render/func_test.go | 2 +- render/html_test.go | 2 +- render/json_test.go | 2 +- render/markdown_test.go | 2 +- render/options.go | 2 +- render/render.go | 6 +- render/string_test.go | 2 +- render/template_test.go | 2 +- render/xml_test.go | 2 +- router_test.go | 2 +- 72 files changed, 195 insertions(+), 195 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0be2ee813..465e7ea86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,149 +1,149 @@ # Change Log -## [v0.5.1](https://github.com/markbates/buffalo/tree/v0.5.1) (2016-12-22) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.5.0...v0.5.1) +## [v0.5.1](https://github.com/gobuffalo/buffalo/tree/v0.5.1) (2016-12-22) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.5.0...v0.5.1) **Closed issues:** -- groups on groups should inherit the prefix of the previous group [\#72](https://github.com/markbates/buffalo/issues/72) -- Improve resource generator to insert the resource into actions/app.go [\#43](https://github.com/markbates/buffalo/issues/43) +- groups on groups should inherit the prefix of the previous group [\#72](https://github.com/gobuffalo/buffalo/issues/72) +- Improve resource generator to insert the resource into actions/app.go [\#43](https://github.com/gobuffalo/buffalo/issues/43) -## [v0.5.0](https://github.com/markbates/buffalo/tree/v0.5.0) (2016-12-21) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.7...v0.5.0) +## [v0.5.0](https://github.com/gobuffalo/buffalo/tree/v0.5.0) (2016-12-21) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.7...v0.5.0) **Closed issues:** -- Log should output host:port when starting up [\#70](https://github.com/markbates/buffalo/issues/70) -- add web pack to the "new" generator [\#18](https://github.com/markbates/buffalo/issues/18) +- Log should output host:port when starting up [\#70](https://github.com/gobuffalo/buffalo/issues/70) +- add web pack to the "new" generator [\#18](https://github.com/gobuffalo/buffalo/issues/18) **Merged pull requests:** -- add web pack to the "new" generator closes \#18 [\#71](https://github.com/markbates/buffalo/pull/71) ([markbates](https://github.com/markbates)) +- add web pack to the "new" generator closes \#18 [\#71](https://github.com/gobuffalo/buffalo/pull/71) ([markbates](https://github.com/markbates)) -## [v0.4.7](https://github.com/markbates/buffalo/tree/v0.4.7) (2016-12-19) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.6...v0.4.7) +## [v0.4.7](https://github.com/gobuffalo/buffalo/tree/v0.4.7) (2016-12-19) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.6...v0.4.7) **Closed issues:** -- Add a generator for Goth [\#65](https://github.com/markbates/buffalo/issues/65) -- Add a REPL/console [\#63](https://github.com/markbates/buffalo/issues/63) +- Add a generator for Goth [\#65](https://github.com/gobuffalo/buffalo/issues/65) +- Add a REPL/console [\#63](https://github.com/gobuffalo/buffalo/issues/63) **Merged pull requests:** -- auto mount a generated resource [\#69](https://github.com/markbates/buffalo/pull/69) ([markbates](https://github.com/markbates)) -- add Host as an option to the App [\#68](https://github.com/markbates/buffalo/pull/68) ([markbates](https://github.com/markbates)) -- Add a generator for Goth closes \#65 [\#66](https://github.com/markbates/buffalo/pull/66) ([markbates](https://github.com/markbates)) -- Add a REPL/console closes \#63 [\#64](https://github.com/markbates/buffalo/pull/64) ([markbates](https://github.com/markbates)) +- auto mount a generated resource [\#69](https://github.com/gobuffalo/buffalo/pull/69) ([markbates](https://github.com/markbates)) +- add Host as an option to the App [\#68](https://github.com/gobuffalo/buffalo/pull/68) ([markbates](https://github.com/markbates)) +- Add a generator for Goth closes \#65 [\#66](https://github.com/gobuffalo/buffalo/pull/66) ([markbates](https://github.com/markbates)) +- Add a REPL/console closes \#63 [\#64](https://github.com/gobuffalo/buffalo/pull/64) ([markbates](https://github.com/markbates)) -## [v0.4.6](https://github.com/markbates/buffalo/tree/v0.4.6) (2016-12-15) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.5...v0.4.6) +## [v0.4.6](https://github.com/gobuffalo/buffalo/tree/v0.4.6) (2016-12-15) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.5...v0.4.6) **Closed issues:** -- Go Get Errors [\#61](https://github.com/markbates/buffalo/issues/61) -- `buffalo db` should forward to `soda` [\#58](https://github.com/markbates/buffalo/issues/58) -- markdown rendering breaks some raymond parsing [\#55](https://github.com/markbates/buffalo/issues/55) -- add template caching [\#54](https://github.com/markbates/buffalo/issues/54) +- Go Get Errors [\#61](https://github.com/gobuffalo/buffalo/issues/61) +- `buffalo db` should forward to `soda` [\#58](https://github.com/gobuffalo/buffalo/issues/58) +- markdown rendering breaks some raymond parsing [\#55](https://github.com/gobuffalo/buffalo/issues/55) +- add template caching [\#54](https://github.com/gobuffalo/buffalo/issues/54) **Merged pull requests:** -- Added a resolvers package to help find and resolve files. [\#62](https://github.com/markbates/buffalo/pull/62) ([markbates](https://github.com/markbates)) -- `buffalo db` should forward to `soda` closes \#58 [\#60](https://github.com/markbates/buffalo/pull/60) ([markbates](https://github.com/markbates)) -- small bug fixes to template caching [\#57](https://github.com/markbates/buffalo/pull/57) ([markbates](https://github.com/markbates)) -- add template caching closes \#54 [\#56](https://github.com/markbates/buffalo/pull/56) ([markbates](https://github.com/markbates)) +- Added a resolvers package to help find and resolve files. [\#62](https://github.com/gobuffalo/buffalo/pull/62) ([markbates](https://github.com/markbates)) +- `buffalo db` should forward to `soda` closes \#58 [\#60](https://github.com/gobuffalo/buffalo/pull/60) ([markbates](https://github.com/markbates)) +- small bug fixes to template caching [\#57](https://github.com/gobuffalo/buffalo/pull/57) ([markbates](https://github.com/markbates)) +- add template caching closes \#54 [\#56](https://github.com/gobuffalo/buffalo/pull/56) ([markbates](https://github.com/markbates)) -## [v0.4.5](https://github.com/markbates/buffalo/tree/v0.4.5) (2016-12-13) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.4...v0.4.5) +## [v0.4.5](https://github.com/gobuffalo/buffalo/tree/v0.4.5) (2016-12-13) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.4...v0.4.5) **Closed issues:** -- generate SHOULDERS.md when deploying a new release. [\#52](https://github.com/markbates/buffalo/issues/52) -- generate js & css files into sub directory of assets [\#49](https://github.com/markbates/buffalo/issues/49) -- PORT should be settable via an ENV var [\#47](https://github.com/markbates/buffalo/issues/47) -- define ENV at the top of actions/app.go [\#46](https://github.com/markbates/buffalo/issues/46) -- Add NewRelic middleware [\#45](https://github.com/markbates/buffalo/issues/45) -- Procfile should use the project name by default [\#44](https://github.com/markbates/buffalo/issues/44) -- Add a "resource" generator [\#41](https://github.com/markbates/buffalo/issues/41) -- Add "bootstrap" to the "new" generator \(optional\) [\#24](https://github.com/markbates/buffalo/issues/24) -- add a markdown renderer [\#13](https://github.com/markbates/buffalo/issues/13) +- generate SHOULDERS.md when deploying a new release. [\#52](https://github.com/gobuffalo/buffalo/issues/52) +- generate js & css files into sub directory of assets [\#49](https://github.com/gobuffalo/buffalo/issues/49) +- PORT should be settable via an ENV var [\#47](https://github.com/gobuffalo/buffalo/issues/47) +- define ENV at the top of actions/app.go [\#46](https://github.com/gobuffalo/buffalo/issues/46) +- Add NewRelic middleware [\#45](https://github.com/gobuffalo/buffalo/issues/45) +- Procfile should use the project name by default [\#44](https://github.com/gobuffalo/buffalo/issues/44) +- Add a "resource" generator [\#41](https://github.com/gobuffalo/buffalo/issues/41) +- Add "bootstrap" to the "new" generator \(optional\) [\#24](https://github.com/gobuffalo/buffalo/issues/24) +- add a markdown renderer [\#13](https://github.com/gobuffalo/buffalo/issues/13) **Merged pull requests:** -- Shoulders [\#53](https://github.com/markbates/buffalo/pull/53) ([markbates](https://github.com/markbates)) -- add a markdown renderer closes \#13 [\#51](https://github.com/markbates/buffalo/pull/51) ([markbates](https://github.com/markbates)) -- generate js & css files into sub directory of assets [\#50](https://github.com/markbates/buffalo/pull/50) ([markbates](https://github.com/markbates)) -- A bunch of fixes [\#48](https://github.com/markbates/buffalo/pull/48) ([markbates](https://github.com/markbates)) +- Shoulders [\#53](https://github.com/gobuffalo/buffalo/pull/53) ([markbates](https://github.com/markbates)) +- add a markdown renderer closes \#13 [\#51](https://github.com/gobuffalo/buffalo/pull/51) ([markbates](https://github.com/markbates)) +- generate js & css files into sub directory of assets [\#50](https://github.com/gobuffalo/buffalo/pull/50) ([markbates](https://github.com/markbates)) +- A bunch of fixes [\#48](https://github.com/gobuffalo/buffalo/pull/48) ([markbates](https://github.com/markbates)) -## [v0.4.4](https://github.com/markbates/buffalo/tree/v0.4.4) (2016-12-11) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.3.1...v0.4.4) +## [v0.4.4](https://github.com/gobuffalo/buffalo/tree/v0.4.4) (2016-12-11) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.3.1...v0.4.4) **Closed issues:** -- generated code should pass govet and golint [\#39](https://github.com/markbates/buffalo/issues/39) -- Run gofmt on generated code [\#38](https://github.com/markbates/buffalo/issues/38) +- generated code should pass govet and golint [\#39](https://github.com/gobuffalo/buffalo/issues/39) +- Run gofmt on generated code [\#38](https://github.com/gobuffalo/buffalo/issues/38) **Merged pull requests:** -- Generators [\#40](https://github.com/markbates/buffalo/pull/40) ([markbates](https://github.com/markbates)) +- Generators [\#40](https://github.com/gobuffalo/buffalo/pull/40) ([markbates](https://github.com/markbates)) -## [v0.4.3.1](https://github.com/markbates/buffalo/tree/v0.4.3.1) (2016-12-11) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.3...v0.4.3.1) +## [v0.4.3.1](https://github.com/gobuffalo/buffalo/tree/v0.4.3.1) (2016-12-11) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.3...v0.4.3.1) -## [v0.4.3](https://github.com/markbates/buffalo/tree/v0.4.3) (2016-12-10) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.2...v0.4.3) +## [v0.4.3](https://github.com/gobuffalo/buffalo/tree/v0.4.3) (2016-12-10) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.2...v0.4.3) **Closed issues:** -- Add some functions from the strings package as helpers [\#33](https://github.com/markbates/buffalo/issues/33) -- Add the functions from https://github.com/markbates/inflect as helpers [\#32](https://github.com/markbates/buffalo/issues/32) -- Add support for mapping "Resources" [\#31](https://github.com/markbates/buffalo/issues/31) -- "grift release" should run the "docker CI" first. [\#29](https://github.com/markbates/buffalo/issues/29) +- Add some functions from the strings package as helpers [\#33](https://github.com/gobuffalo/buffalo/issues/33) +- Add the functions from https://github.com/markbates/inflect as helpers [\#32](https://github.com/gobuffalo/buffalo/issues/32) +- Add support for mapping "Resources" [\#31](https://github.com/gobuffalo/buffalo/issues/31) +- "grift release" should run the "docker CI" first. [\#29](https://github.com/gobuffalo/buffalo/issues/29) **Merged pull requests:** -- added more helpers. closes \#32 closes \#33 [\#34](https://github.com/markbates/buffalo/pull/34) ([markbates](https://github.com/markbates)) -- Working on adding support for a Resource interface [\#30](https://github.com/markbates/buffalo/pull/30) ([markbates](https://github.com/markbates)) +- added more helpers. closes \#32 closes \#33 [\#34](https://github.com/gobuffalo/buffalo/pull/34) ([markbates](https://github.com/markbates)) +- Working on adding support for a Resource interface [\#30](https://github.com/gobuffalo/buffalo/pull/30) ([markbates](https://github.com/markbates)) -## [v0.4.2](https://github.com/markbates/buffalo/tree/v0.4.2) (2016-12-09) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.1...v0.4.2) +## [v0.4.2](https://github.com/gobuffalo/buffalo/tree/v0.4.2) (2016-12-09) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.1...v0.4.2) -## [v0.4.1](https://github.com/markbates/buffalo/tree/v0.4.1) (2016-12-09) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.1.pre...v0.4.1) +## [v0.4.1](https://github.com/gobuffalo/buffalo/tree/v0.4.1) (2016-12-09) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.1.pre...v0.4.1) -## [v0.4.1.pre](https://github.com/markbates/buffalo/tree/v0.4.1.pre) (2016-12-09) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.0...v0.4.1.pre) +## [v0.4.1.pre](https://github.com/gobuffalo/buffalo/tree/v0.4.1.pre) (2016-12-09) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.0...v0.4.1.pre) -## [v0.4.0](https://github.com/markbates/buffalo/tree/v0.4.0) (2016-12-09) -[Full Changelog](https://github.com/markbates/buffalo/compare/v0.4.0.pre...v0.4.0) +## [v0.4.0](https://github.com/gobuffalo/buffalo/tree/v0.4.0) (2016-12-09) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/v0.4.0.pre...v0.4.0) -## [v0.4.0.pre](https://github.com/markbates/buffalo/tree/v0.4.0.pre) (2016-12-09) -[Full Changelog](https://github.com/markbates/buffalo/compare/0.4.0...v0.4.0.pre) +## [v0.4.0.pre](https://github.com/gobuffalo/buffalo/tree/v0.4.0.pre) (2016-12-09) +[Full Changelog](https://github.com/gobuffalo/buffalo/compare/0.4.0...v0.4.0.pre) -## [0.4.0](https://github.com/markbates/buffalo/tree/0.4.0) (2016-12-09) +## [0.4.0](https://github.com/gobuffalo/buffalo/tree/0.4.0) (2016-12-09) **Closed issues:** -- replace httprouter with gorilla mux [\#27](https://github.com/markbates/buffalo/issues/27) -- Add "jQuery" to the "new" generator \(optional\) [\#23](https://github.com/markbates/buffalo/issues/23) -- Generate a Procfile in the `new` generator [\#21](https://github.com/markbates/buffalo/issues/21) -- Add a pop transaction middleware to the "new" generator [\#15](https://github.com/markbates/buffalo/issues/15) -- add a cmd to run the app in "dev" w/ refresh [\#12](https://github.com/markbates/buffalo/issues/12) -- Add refresh to the generator [\#11](https://github.com/markbates/buffalo/issues/11) -- Add pop/soda to the generator [\#10](https://github.com/markbates/buffalo/issues/10) -- Add grift to the generator [\#9](https://github.com/markbates/buffalo/issues/9) -- add a wrapHandlerFunc fund [\#8](https://github.com/markbates/buffalo/issues/8) -- add a wrapHandler function [\#7](https://github.com/markbates/buffalo/issues/7) -- Add template caching [\#6](https://github.com/markbates/buffalo/issues/6) -- Serve static files [\#5](https://github.com/markbates/buffalo/issues/5) -- Add Websocket support [\#4](https://github.com/markbates/buffalo/issues/4) -- Need `bind` function [\#3](https://github.com/markbates/buffalo/issues/3) -- Need README [\#2](https://github.com/markbates/buffalo/issues/2) -- Need GoDoc [\#1](https://github.com/markbates/buffalo/issues/1) +- replace httprouter with gorilla mux [\#27](https://github.com/gobuffalo/buffalo/issues/27) +- Add "jQuery" to the "new" generator \(optional\) [\#23](https://github.com/gobuffalo/buffalo/issues/23) +- Generate a Procfile in the `new` generator [\#21](https://github.com/gobuffalo/buffalo/issues/21) +- Add a pop transaction middleware to the "new" generator [\#15](https://github.com/gobuffalo/buffalo/issues/15) +- add a cmd to run the app in "dev" w/ refresh [\#12](https://github.com/gobuffalo/buffalo/issues/12) +- Add refresh to the generator [\#11](https://github.com/gobuffalo/buffalo/issues/11) +- Add pop/soda to the generator [\#10](https://github.com/gobuffalo/buffalo/issues/10) +- Add grift to the generator [\#9](https://github.com/gobuffalo/buffalo/issues/9) +- add a wrapHandlerFunc fund [\#8](https://github.com/gobuffalo/buffalo/issues/8) +- add a wrapHandler function [\#7](https://github.com/gobuffalo/buffalo/issues/7) +- Add template caching [\#6](https://github.com/gobuffalo/buffalo/issues/6) +- Serve static files [\#5](https://github.com/gobuffalo/buffalo/issues/5) +- Add Websocket support [\#4](https://github.com/gobuffalo/buffalo/issues/4) +- Need `bind` function [\#3](https://github.com/gobuffalo/buffalo/issues/3) +- Need README [\#2](https://github.com/gobuffalo/buffalo/issues/2) +- Need GoDoc [\#1](https://github.com/gobuffalo/buffalo/issues/1) **Merged pull requests:** -- replace httprouter with gorilla mux closes closes \#27 [\#28](https://github.com/markbates/buffalo/pull/28) ([markbates](https://github.com/markbates)) -- added some helpers and event source support [\#26](https://github.com/markbates/buffalo/pull/26) ([markbates](https://github.com/markbates)) -- switched over to using gentronics for generating templates [\#25](https://github.com/markbates/buffalo/pull/25) ([markbates](https://github.com/markbates)) +- replace httprouter with gorilla mux closes closes \#27 [\#28](https://github.com/gobuffalo/buffalo/pull/28) ([markbates](https://github.com/markbates)) +- added some helpers and event source support [\#26](https://github.com/gobuffalo/buffalo/pull/26) ([markbates](https://github.com/markbates)) +- switched over to using gentronics for generating templates [\#25](https://github.com/gobuffalo/buffalo/pull/25) ([markbates](https://github.com/markbates)) diff --git a/Dockerfile b/Dockerfile index 377639b33..3abb630ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update RUN curl -sL https://deb.nodesource.com/setup_7.x | bash RUN apt-get install -y build-essential nodejs -ENV BP=$GOPATH/src/github.com/markbates/buffalo +ENV BP=$GOPATH/src/github.com/gobuffalo/buffalo RUN mkdir -p $BP WORKDIR $BP diff --git a/README.md b/README.md index ff2f9889c..fea47f529 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Buffalo [![GoDoc](https://godoc.org/github.com/markbates/buffalo?status.svg)](https://godoc.org/github.com/markbates/buffalo) [![Build Status](https://travis-ci.org/markbates/buffalo.svg?branch=master)](https://travis-ci.org/markbates/buffalo) [![Code Climate](https://codeclimate.com/github/markbates/buffalo/badges/gpa.svg)](https://codeclimate.com/github/markbates/buffalo) +# Buffalo [![GoDoc](https://godoc.org/github.com/gobuffalo/buffalo?status.svg)](https://godoc.org/github.com/gobuffalo/buffalo) [![Build Status](https://travis-ci.org/gobuffalo/buffalo.svg?branch=master)](https://travis-ci.org/gobuffalo/buffalo) [![Code Climate](https://codeclimate.com/github/gobuffalo/buffalo/badges/gpa.svg)](https://codeclimate.com/github/gobuffalo/buffalo) Buffalo is Go web framework. Yeah, I hate the word "framework" too! Buffalo is different though. Buffalo doesn't want to re-invent wheels like routing and templating. Buffalo is glue that wraps all of the best packages available and makes them all play nicely together. @@ -15,7 +15,7 @@ Please visit [http://gobuffalo.io](http://gobuffalo.io) for the latest documenta ## Installation ```text -$ go get -u github.com/markbates/buffalo/buffalo +$ go get -u github.com/gobuffalo/buffalo/buffalo ``` ## Generating a new Project diff --git a/SHOULDERS.md b/SHOULDERS.md index dc2bf1a46..879808698 100644 --- a/SHOULDERS.md +++ b/SHOULDERS.md @@ -42,11 +42,11 @@ Thank you to the following **GIANTS**: * [github.com/kardianos/osext](https://github.com/kardianos/osext) -* [github.com/markbates/buffalo/render](https://github.com/markbates/buffalo/render) +* [github.com/gobuffalo/buffalo/render](https://github.com/gobuffalo/buffalo/render) -* [github.com/markbates/buffalo/render/helpers](https://github.com/markbates/buffalo/render/helpers) +* [github.com/gobuffalo/buffalo/render/helpers](https://github.com/gobuffalo/buffalo/render/helpers) -* [github.com/markbates/buffalo/render/resolvers](https://github.com/markbates/buffalo/render/resolvers) +* [github.com/gobuffalo/buffalo/render/resolvers](https://github.com/gobuffalo/buffalo/render/resolvers) * [github.com/markbates/going/defaults](https://github.com/markbates/going/defaults) diff --git a/buffalo/cmd/app_generators.go b/buffalo/cmd/app_generators.go index 063d9dc91..9481181bc 100644 --- a/buffalo/cmd/app_generators.go +++ b/buffalo/cmd/app_generators.go @@ -3,7 +3,7 @@ package cmd import ( "os/exec" - "github.com/markbates/buffalo/buffalo/cmd/generate" + "github.com/gobuffalo/buffalo/buffalo/cmd/generate" "github.com/markbates/gentronics" ) @@ -22,7 +22,7 @@ func newAppGenerator(data gentronics.Data) *gentronics.Generator { g.Add(gentronics.NewFile("templates/application.html", nApplicationHTML)) g.Add(&gentronics.RemoteFile{ File: gentronics.NewFile("public/assets/images/logo.svg", ""), - RemotePath: "https://raw.githubusercontent.com/markbates/buffalo/master/logo.svg", + RemotePath: "https://raw.githubusercontent.com/gobuffalo/buffalo/master/logo.svg", }) g.Add(gentronics.NewFile(".gitignore", nGitignore)) g.Add(gentronics.NewCommand(goGet("github.com/markbates/refresh/..."))) @@ -71,9 +71,9 @@ const nApp = `package actions import ( "os" - "github.com/markbates/buffalo" + "github.com/gobuffalo/buffalo" {{#if withPop }} - "github.com/markbates/buffalo/middleware" + "github.com/gobuffalo/buffalo/middleware" "{{modelsPath}}" {{/if}} "github.com/markbates/going/defaults" @@ -112,8 +112,8 @@ import ( "net/http" rice "github.com/GeertJohan/go.rice" - "github.com/markbates/buffalo/render" - "github.com/markbates/buffalo/render/resolvers" + "github.com/gobuffalo/buffalo/render" + "github.com/gobuffalo/buffalo/render/resolvers" ) var r *render.Engine @@ -137,7 +137,7 @@ func assetsPath() http.FileSystem { const nHomeHandler = `package actions -import "github.com/markbates/buffalo" +import "github.com/gobuffalo/buffalo" // HomeHandler is a default handler to serve up // a home page. @@ -174,7 +174,7 @@ const nIndexHTML = `

Welcome to Buffalo! [v{{version}}]

- https://github.com/markbates/buffalo + https://github.com/gobuffalo/buffalo

Documentation diff --git a/buffalo/cmd/generate.go b/buffalo/cmd/generate.go index c58be4d34..9a06c2e53 100644 --- a/buffalo/cmd/generate.go +++ b/buffalo/cmd/generate.go @@ -21,7 +21,7 @@ package cmd import ( - "github.com/markbates/buffalo/buffalo/cmd/generate" + "github.com/gobuffalo/buffalo/buffalo/cmd/generate" "github.com/spf13/cobra" ) diff --git a/buffalo/cmd/generate/goth.go b/buffalo/cmd/generate/goth.go index a8c6a67fa..0ccbdc702 100644 --- a/buffalo/cmd/generate/goth.go +++ b/buffalo/cmd/generate/goth.go @@ -56,7 +56,7 @@ import ( "fmt" "os" - "github.com/markbates/buffalo" + "github.com/gobuffalo/buffalo" "github.com/markbates/goth" "github.com/markbates/goth/gothic" {{#each providers}} diff --git a/buffalo/cmd/generate/resource.go b/buffalo/cmd/generate/resource.go index b9e6c4465..baa4d902c 100644 --- a/buffalo/cmd/generate/resource.go +++ b/buffalo/cmd/generate/resource.go @@ -63,7 +63,7 @@ func NewResourceGenerator(data gentronics.Data) *gentronics.Generator { var rAction = `package actions -import "github.com/markbates/buffalo" +import "github.com/gobuffalo/buffalo" type {{camel}}Resource struct{ buffalo.Resource diff --git a/buffalo/cmd/version.go b/buffalo/cmd/version.go index dd5ab549a..b20793d44 100644 --- a/buffalo/cmd/version.go +++ b/buffalo/cmd/version.go @@ -1,4 +1,4 @@ package cmd // Version is the current version of the buffalo binary -var Version = "0.5.1" +var Version = "0.6.0" diff --git a/buffalo/main.go b/buffalo/main.go index 22ad1fb4c..aa90375b4 100644 --- a/buffalo/main.go +++ b/buffalo/main.go @@ -20,7 +20,7 @@ package main -import "github.com/markbates/buffalo/buffalo/cmd" +import "github.com/gobuffalo/buffalo/buffalo/cmd" func main() { cmd.Execute() diff --git a/context.go b/context.go index d7a7330ae..27c526b03 100644 --- a/context.go +++ b/context.go @@ -5,7 +5,7 @@ import ( "github.com/gorilla/websocket" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" ) // Context holds on to information as you diff --git a/default_context.go b/default_context.go index ec0230f2c..25def6f6f 100644 --- a/default_context.go +++ b/default_context.go @@ -12,7 +12,7 @@ import ( "github.com/gorilla/schema" "github.com/gorilla/websocket" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/pkg/errors" ) diff --git a/default_context_test.go b/default_context_test.go index 79cf4e5c4..55651f191 100644 --- a/default_context_test.go +++ b/default_context_test.go @@ -12,7 +12,7 @@ import ( "golang.org/x/net/websocket" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/markbates/willie" "github.com/pkg/errors" "github.com/stretchr/testify/require" diff --git a/examples/hello-world/actions/app.go b/examples/hello-world/actions/app.go index 16cf2cf44..0f12f4c48 100644 --- a/examples/hello-world/actions/app.go +++ b/examples/hello-world/actions/app.go @@ -3,7 +3,7 @@ package actions import ( "os" - "github.com/markbates/buffalo" + "github.com/gobuffalo/buffalo" "github.com/markbates/going/defaults" ) diff --git a/examples/hello-world/actions/home.go b/examples/hello-world/actions/home.go index 1521b687a..e34a955a7 100644 --- a/examples/hello-world/actions/home.go +++ b/examples/hello-world/actions/home.go @@ -1,6 +1,6 @@ package actions -import "github.com/markbates/buffalo" +import "github.com/gobuffalo/buffalo" func HomeHandler(c buffalo.Context) error { return c.Render(200, r.HTML("index.html")) diff --git a/examples/hello-world/actions/home_test.go b/examples/hello-world/actions/home_test.go index 496b55cc4..f528a77b2 100644 --- a/examples/hello-world/actions/home_test.go +++ b/examples/hello-world/actions/home_test.go @@ -3,7 +3,7 @@ package actions_test import ( "testing" - "github.com/markbates/buffalo/examples/hello-world/actions" + "github.com/gobuffalo/buffalo/examples/hello-world/actions" "github.com/markbates/willie" "github.com/stretchr/testify/require" ) diff --git a/examples/hello-world/actions/render.go b/examples/hello-world/actions/render.go index ae36c36d8..8d47cc95b 100644 --- a/examples/hello-world/actions/render.go +++ b/examples/hello-world/actions/render.go @@ -4,8 +4,8 @@ import ( "net/http" rice "github.com/GeertJohan/go.rice" - "github.com/markbates/buffalo/render" - "github.com/markbates/buffalo/render/resolvers" + "github.com/gobuffalo/buffalo/render" + "github.com/gobuffalo/buffalo/render/resolvers" ) var r *render.Engine diff --git a/examples/hello-world/grifts/routes.go b/examples/hello-world/grifts/routes.go index f40a73f97..8dc9ec168 100644 --- a/examples/hello-world/grifts/routes.go +++ b/examples/hello-world/grifts/routes.go @@ -3,7 +3,7 @@ package grifts import ( "os" - "github.com/markbates/buffalo/examples/hello-world/actions" + "github.com/gobuffalo/buffalo/examples/hello-world/actions" . "github.com/markbates/grift/grift" "github.com/olekukonko/tablewriter" ) diff --git a/examples/hello-world/main.go b/examples/hello-world/main.go index 485a28b92..5b6b1fae8 100644 --- a/examples/hello-world/main.go +++ b/examples/hello-world/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/markbates/buffalo/examples/hello-world/actions" + "github.com/gobuffalo/buffalo/examples/hello-world/actions" "github.com/markbates/going/defaults" ) diff --git a/examples/html-crud/actions/actions_test.go b/examples/html-crud/actions/actions_test.go index be91fe153..b24160046 100644 --- a/examples/html-crud/actions/actions_test.go +++ b/examples/html-crud/actions/actions_test.go @@ -1,7 +1,7 @@ package actions_test import ( - "github.com/markbates/buffalo/examples/html-crud/models" + "github.com/gobuffalo/buffalo/examples/html-crud/models" "github.com/markbates/pop" ) diff --git a/examples/html-crud/actions/app.go b/examples/html-crud/actions/app.go index a47f9960e..713d5ba73 100644 --- a/examples/html-crud/actions/app.go +++ b/examples/html-crud/actions/app.go @@ -4,9 +4,9 @@ import ( "net/http" "os" - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/html-crud/models" - "github.com/markbates/buffalo/middleware" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/html-crud/models" + "github.com/gobuffalo/buffalo/middleware" "github.com/markbates/going/defaults" ) diff --git a/examples/html-crud/actions/render.go b/examples/html-crud/actions/render.go index ae36c36d8..8d47cc95b 100644 --- a/examples/html-crud/actions/render.go +++ b/examples/html-crud/actions/render.go @@ -4,8 +4,8 @@ import ( "net/http" rice "github.com/GeertJohan/go.rice" - "github.com/markbates/buffalo/render" - "github.com/markbates/buffalo/render/resolvers" + "github.com/gobuffalo/buffalo/render" + "github.com/gobuffalo/buffalo/render/resolvers" ) var r *render.Engine diff --git a/examples/html-crud/actions/users.go b/examples/html-crud/actions/users.go index de45c08cd..c51cc7f55 100644 --- a/examples/html-crud/actions/users.go +++ b/examples/html-crud/actions/users.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/html-crud/models" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/html-crud/models" "github.com/markbates/pop" "github.com/pkg/errors" ) diff --git a/examples/html-crud/actions/users_test.go b/examples/html-crud/actions/users_test.go index 22463648b..869260469 100644 --- a/examples/html-crud/actions/users_test.go +++ b/examples/html-crud/actions/users_test.go @@ -3,8 +3,8 @@ package actions_test import ( "testing" - "github.com/markbates/buffalo/examples/html-crud/actions" - "github.com/markbates/buffalo/examples/html-crud/models" + "github.com/gobuffalo/buffalo/examples/html-crud/actions" + "github.com/gobuffalo/buffalo/examples/html-crud/models" "github.com/markbates/pop" "github.com/markbates/willie" "github.com/stretchr/testify/require" diff --git a/examples/html-crud/grifts/db.go b/examples/html-crud/grifts/db.go index d2fa58d35..0de17996e 100644 --- a/examples/html-crud/grifts/db.go +++ b/examples/html-crud/grifts/db.go @@ -1,7 +1,7 @@ package grifts import ( - "github.com/markbates/buffalo/examples/html-crud/models" + "github.com/gobuffalo/buffalo/examples/html-crud/models" . "github.com/markbates/grift/grift" "github.com/markbates/pop" ) diff --git a/examples/html-crud/grifts/routes.go b/examples/html-crud/grifts/routes.go index fac038042..cda992c34 100644 --- a/examples/html-crud/grifts/routes.go +++ b/examples/html-crud/grifts/routes.go @@ -3,7 +3,7 @@ package grifts import ( "os" - "github.com/markbates/buffalo/examples/html-crud/actions" + "github.com/gobuffalo/buffalo/examples/html-crud/actions" . "github.com/markbates/grift/grift" "github.com/olekukonko/tablewriter" ) diff --git a/examples/html-crud/main.go b/examples/html-crud/main.go index 440f9dcf5..1ac632db3 100644 --- a/examples/html-crud/main.go +++ b/examples/html-crud/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/markbates/buffalo/examples/html-crud/actions" + "github.com/gobuffalo/buffalo/examples/html-crud/actions" "github.com/markbates/going/defaults" ) diff --git a/examples/html-resource/actions/actions_test.go b/examples/html-resource/actions/actions_test.go index c3e9a25f8..6883af09b 100644 --- a/examples/html-resource/actions/actions_test.go +++ b/examples/html-resource/actions/actions_test.go @@ -1,7 +1,7 @@ package actions_test import ( - "github.com/markbates/buffalo/examples/html-resource/models" + "github.com/gobuffalo/buffalo/examples/html-resource/models" "github.com/markbates/pop" ) diff --git a/examples/html-resource/actions/app.go b/examples/html-resource/actions/app.go index 280793dd4..76b0f3f71 100644 --- a/examples/html-resource/actions/app.go +++ b/examples/html-resource/actions/app.go @@ -4,9 +4,9 @@ import ( "net/http" "os" - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/html-resource/models" - "github.com/markbates/buffalo/middleware" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/html-resource/models" + "github.com/gobuffalo/buffalo/middleware" "github.com/markbates/going/defaults" ) diff --git a/examples/html-resource/actions/render.go b/examples/html-resource/actions/render.go index ae36c36d8..8d47cc95b 100644 --- a/examples/html-resource/actions/render.go +++ b/examples/html-resource/actions/render.go @@ -4,8 +4,8 @@ import ( "net/http" rice "github.com/GeertJohan/go.rice" - "github.com/markbates/buffalo/render" - "github.com/markbates/buffalo/render/resolvers" + "github.com/gobuffalo/buffalo/render" + "github.com/gobuffalo/buffalo/render/resolvers" ) var r *render.Engine diff --git a/examples/html-resource/actions/users.go b/examples/html-resource/actions/users.go index 46d97e053..438749fbe 100644 --- a/examples/html-resource/actions/users.go +++ b/examples/html-resource/actions/users.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/html-resource/models" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/html-resource/models" "github.com/markbates/pop" "github.com/pkg/errors" ) diff --git a/examples/html-resource/actions/users_test.go b/examples/html-resource/actions/users_test.go index d922b7194..a49afbe87 100644 --- a/examples/html-resource/actions/users_test.go +++ b/examples/html-resource/actions/users_test.go @@ -3,8 +3,8 @@ package actions_test import ( "testing" - "github.com/markbates/buffalo/examples/html-resource/actions" - "github.com/markbates/buffalo/examples/html-resource/models" + "github.com/gobuffalo/buffalo/examples/html-resource/actions" + "github.com/gobuffalo/buffalo/examples/html-resource/models" "github.com/markbates/pop" "github.com/markbates/willie" "github.com/stretchr/testify/require" diff --git a/examples/html-resource/grifts/db.go b/examples/html-resource/grifts/db.go index 0286a34f2..d290c6cdc 100644 --- a/examples/html-resource/grifts/db.go +++ b/examples/html-resource/grifts/db.go @@ -1,7 +1,7 @@ package grifts import ( - "github.com/markbates/buffalo/examples/html-resource/models" + "github.com/gobuffalo/buffalo/examples/html-resource/models" . "github.com/markbates/grift/grift" "github.com/markbates/pop" ) diff --git a/examples/html-resource/grifts/routes.go b/examples/html-resource/grifts/routes.go index 55601cb9d..039c8e4f4 100644 --- a/examples/html-resource/grifts/routes.go +++ b/examples/html-resource/grifts/routes.go @@ -3,7 +3,7 @@ package grifts import ( "os" - "github.com/markbates/buffalo/examples/html-resource/actions" + "github.com/gobuffalo/buffalo/examples/html-resource/actions" . "github.com/markbates/grift/grift" "github.com/olekukonko/tablewriter" ) diff --git a/examples/html-resource/main.go b/examples/html-resource/main.go index d482b465a..45b42e206 100644 --- a/examples/html-resource/main.go +++ b/examples/html-resource/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/markbates/buffalo/examples/html-resource/actions" + "github.com/gobuffalo/buffalo/examples/html-resource/actions" "github.com/markbates/going/defaults" ) diff --git a/examples/json-crud/actions/actions_test.go b/examples/json-crud/actions/actions_test.go index bb7a6dd64..b458e805e 100644 --- a/examples/json-crud/actions/actions_test.go +++ b/examples/json-crud/actions/actions_test.go @@ -1,7 +1,7 @@ package actions_test import ( - "github.com/markbates/buffalo/examples/json-crud/models" + "github.com/gobuffalo/buffalo/examples/json-crud/models" "github.com/markbates/pop" ) diff --git a/examples/json-crud/actions/app.go b/examples/json-crud/actions/app.go index f156e8346..819774246 100644 --- a/examples/json-crud/actions/app.go +++ b/examples/json-crud/actions/app.go @@ -3,9 +3,9 @@ package actions import ( "os" - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/json-crud/models" - "github.com/markbates/buffalo/middleware" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/json-crud/models" + "github.com/gobuffalo/buffalo/middleware" "github.com/markbates/going/defaults" ) diff --git a/examples/json-crud/actions/users.go b/examples/json-crud/actions/users.go index 8f83a582c..b4ad89d24 100644 --- a/examples/json-crud/actions/users.go +++ b/examples/json-crud/actions/users.go @@ -1,9 +1,9 @@ package actions import ( - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/json-crud/models" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/json-crud/models" + "github.com/gobuffalo/buffalo/render" "github.com/markbates/pop" "github.com/pkg/errors" ) diff --git a/examples/json-crud/actions/users_test.go b/examples/json-crud/actions/users_test.go index b2c09f4d0..961eab2ae 100644 --- a/examples/json-crud/actions/users_test.go +++ b/examples/json-crud/actions/users_test.go @@ -3,8 +3,8 @@ package actions_test import ( "testing" - "github.com/markbates/buffalo/examples/json-crud/actions" - "github.com/markbates/buffalo/examples/json-crud/models" + "github.com/gobuffalo/buffalo/examples/json-crud/actions" + "github.com/gobuffalo/buffalo/examples/json-crud/models" "github.com/markbates/going/validate" "github.com/markbates/pop" "github.com/markbates/willie" diff --git a/examples/json-crud/grifts/routes.go b/examples/json-crud/grifts/routes.go index f6838b204..f9e3d2385 100644 --- a/examples/json-crud/grifts/routes.go +++ b/examples/json-crud/grifts/routes.go @@ -3,7 +3,7 @@ package grifts import ( "os" - "github.com/markbates/buffalo/examples/json-crud/actions" + "github.com/gobuffalo/buffalo/examples/json-crud/actions" . "github.com/markbates/grift/grift" "github.com/olekukonko/tablewriter" ) diff --git a/examples/json-crud/main.go b/examples/json-crud/main.go index 92ba6fca1..3a3e55a63 100644 --- a/examples/json-crud/main.go +++ b/examples/json-crud/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/markbates/buffalo/examples/json-crud/actions" + "github.com/gobuffalo/buffalo/examples/json-crud/actions" "github.com/markbates/going/defaults" ) diff --git a/examples/json-resource/actions/actions_test.go b/examples/json-resource/actions/actions_test.go index 1cd0c0955..feba1241f 100644 --- a/examples/json-resource/actions/actions_test.go +++ b/examples/json-resource/actions/actions_test.go @@ -1,7 +1,7 @@ package actions_test import ( - "github.com/markbates/buffalo/examples/json-resource/models" + "github.com/gobuffalo/buffalo/examples/json-resource/models" "github.com/markbates/pop" ) diff --git a/examples/json-resource/actions/app.go b/examples/json-resource/actions/app.go index e633fbd7b..2fe1073cd 100644 --- a/examples/json-resource/actions/app.go +++ b/examples/json-resource/actions/app.go @@ -3,9 +3,9 @@ package actions import ( "os" - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/json-resource/models" - "github.com/markbates/buffalo/middleware" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/json-resource/models" + "github.com/gobuffalo/buffalo/middleware" "github.com/markbates/going/defaults" ) diff --git a/examples/json-resource/actions/users.go b/examples/json-resource/actions/users.go index c82332628..575231889 100644 --- a/examples/json-resource/actions/users.go +++ b/examples/json-resource/actions/users.go @@ -1,9 +1,9 @@ package actions import ( - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/examples/json-resource/models" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/examples/json-resource/models" + "github.com/gobuffalo/buffalo/render" "github.com/markbates/pop" "github.com/pkg/errors" ) diff --git a/examples/json-resource/actions/users_test.go b/examples/json-resource/actions/users_test.go index ab5c1db08..e813ca042 100644 --- a/examples/json-resource/actions/users_test.go +++ b/examples/json-resource/actions/users_test.go @@ -3,8 +3,8 @@ package actions_test import ( "testing" - "github.com/markbates/buffalo/examples/json-resource/actions" - "github.com/markbates/buffalo/examples/json-resource/models" + "github.com/gobuffalo/buffalo/examples/json-resource/actions" + "github.com/gobuffalo/buffalo/examples/json-resource/models" "github.com/markbates/going/validate" "github.com/markbates/pop" "github.com/markbates/willie" diff --git a/examples/json-resource/grifts/routes.go b/examples/json-resource/grifts/routes.go index 1cd452055..436c0049f 100644 --- a/examples/json-resource/grifts/routes.go +++ b/examples/json-resource/grifts/routes.go @@ -3,7 +3,7 @@ package grifts import ( "os" - "github.com/markbates/buffalo/examples/json-resource/actions" + "github.com/gobuffalo/buffalo/examples/json-resource/actions" . "github.com/markbates/grift/grift" "github.com/olekukonko/tablewriter" ) diff --git a/examples/json-resource/main.go b/examples/json-resource/main.go index c7bb57cbe..0f2c0fc49 100644 --- a/examples/json-resource/main.go +++ b/examples/json-resource/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/markbates/buffalo/examples/json-resource/actions" + "github.com/gobuffalo/buffalo/examples/json-resource/actions" "github.com/markbates/going/defaults" ) diff --git a/examples/simple_hello/main.go b/examples/simple_hello/main.go index 252669dfd..0e81357fc 100644 --- a/examples/simple_hello/main.go +++ b/examples/simple_hello/main.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/render" ) func main() { diff --git a/examples/websockets/actions/app.go b/examples/websockets/actions/app.go index 5a40a4684..05c3835b7 100644 --- a/examples/websockets/actions/app.go +++ b/examples/websockets/actions/app.go @@ -3,7 +3,7 @@ package actions import ( "os" - "github.com/markbates/buffalo" + "github.com/gobuffalo/buffalo" "github.com/markbates/going/defaults" ) diff --git a/examples/websockets/actions/home.go b/examples/websockets/actions/home.go index 1521b687a..e34a955a7 100644 --- a/examples/websockets/actions/home.go +++ b/examples/websockets/actions/home.go @@ -1,6 +1,6 @@ package actions -import "github.com/markbates/buffalo" +import "github.com/gobuffalo/buffalo" func HomeHandler(c buffalo.Context) error { return c.Render(200, r.HTML("index.html")) diff --git a/examples/websockets/actions/home_test.go b/examples/websockets/actions/home_test.go index 92c83028e..02b073a24 100644 --- a/examples/websockets/actions/home_test.go +++ b/examples/websockets/actions/home_test.go @@ -3,7 +3,7 @@ package actions_test import ( "testing" - "github.com/markbates/buffalo/examples/websockets/actions" + "github.com/gobuffalo/buffalo/examples/websockets/actions" "github.com/markbates/willie" "github.com/stretchr/testify/require" ) diff --git a/examples/websockets/actions/render.go b/examples/websockets/actions/render.go index ae36c36d8..8d47cc95b 100644 --- a/examples/websockets/actions/render.go +++ b/examples/websockets/actions/render.go @@ -4,8 +4,8 @@ import ( "net/http" rice "github.com/GeertJohan/go.rice" - "github.com/markbates/buffalo/render" - "github.com/markbates/buffalo/render/resolvers" + "github.com/gobuffalo/buffalo/render" + "github.com/gobuffalo/buffalo/render/resolvers" ) var r *render.Engine diff --git a/examples/websockets/actions/socket.go b/examples/websockets/actions/socket.go index 2a4d2ff8e..0d2357b4a 100644 --- a/examples/websockets/actions/socket.go +++ b/examples/websockets/actions/socket.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/markbates/buffalo" + "github.com/gobuffalo/buffalo" "github.com/pkg/errors" ) diff --git a/examples/websockets/grifts/routes.go b/examples/websockets/grifts/routes.go index 5d6798696..43e108173 100644 --- a/examples/websockets/grifts/routes.go +++ b/examples/websockets/grifts/routes.go @@ -3,7 +3,7 @@ package grifts import ( "os" - "github.com/markbates/buffalo/examples/websockets/actions" + "github.com/gobuffalo/buffalo/examples/websockets/actions" . "github.com/markbates/grift/grift" "github.com/olekukonko/tablewriter" ) diff --git a/examples/websockets/main.go b/examples/websockets/main.go index 7087b2aa0..7d47d635d 100644 --- a/examples/websockets/main.go +++ b/examples/websockets/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/markbates/buffalo/examples/websockets/actions" + "github.com/gobuffalo/buffalo/examples/websockets/actions" "github.com/markbates/going/defaults" ) diff --git a/grifts/release.go b/grifts/release.go index 165f254d2..5098cbb28 100644 --- a/grifts/release.go +++ b/grifts/release.go @@ -97,7 +97,7 @@ func tagRelease(v string) error { return err } - res, err := http.Post(fmt.Sprintf("https://api.github.com/repos/markbates/buffalo/releases?access_token=%s", token), "application/json", bytes.NewReader(b)) + res, err := http.Post(fmt.Sprintf("https://api.github.com/repos/gobuffalo/buffalo/releases?access_token=%s", token), "application/json", bytes.NewReader(b)) if err != nil { return err } diff --git a/handler.go b/handler.go index 3cce443fc..f671f8d9e 100644 --- a/handler.go +++ b/handler.go @@ -18,7 +18,7 @@ import ( } func (c Context) error { - return C.Redirect(301, "http://github.com/markbates/buffalo") + return C.Redirect(301, "http://github.com/gobuffalo/buffalo") } func (c Context) error { diff --git a/method_override_test.go b/method_override_test.go index 5fd597972..d4540d0bb 100644 --- a/method_override_test.go +++ b/method_override_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/markbates/willie" "github.com/stretchr/testify/require" ) diff --git a/middleware/content_type.go b/middleware/content_type.go index 650ad9793..ed2dc217e 100644 --- a/middleware/content_type.go +++ b/middleware/content_type.go @@ -1,6 +1,6 @@ package middleware -import "github.com/markbates/buffalo" +import "github.com/gobuffalo/buffalo" // SetContentType on the request to desired type. This will // override any content type sent by the client. diff --git a/middleware/content_type_test.go b/middleware/content_type_test.go index 92a8272f0..9001bd1e1 100644 --- a/middleware/content_type_test.go +++ b/middleware/content_type_test.go @@ -3,9 +3,9 @@ package middleware_test import ( "testing" - "github.com/markbates/buffalo" - "github.com/markbates/buffalo/middleware" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo" + "github.com/gobuffalo/buffalo/middleware" + "github.com/gobuffalo/buffalo/render" "github.com/markbates/willie" "github.com/stretchr/testify/require" ) diff --git a/middleware/new_relic.go b/middleware/new_relic.go index ee56717a7..ee26cb66d 100644 --- a/middleware/new_relic.go +++ b/middleware/new_relic.go @@ -3,7 +3,7 @@ package middleware import ( "fmt" - "github.com/markbates/buffalo" + "github.com/gobuffalo/buffalo" newrelic "github.com/newrelic/go-agent" ) diff --git a/middleware/pop_transaction.go b/middleware/pop_transaction.go index 16c07dd8c..77bef1acc 100644 --- a/middleware/pop_transaction.go +++ b/middleware/pop_transaction.go @@ -3,7 +3,7 @@ package middleware import ( "time" - "github.com/markbates/buffalo" + "github.com/gobuffalo/buffalo" "github.com/markbates/pop" ) diff --git a/render/func_test.go b/render/func_test.go index 21192b7b5..3f95219a0 100644 --- a/render/func_test.go +++ b/render/func_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/stretchr/testify/require" ) diff --git a/render/html_test.go b/render/html_test.go index bf997f805..c7c9c6839 100644 --- a/render/html_test.go +++ b/render/html_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/stretchr/testify/require" ) diff --git a/render/json_test.go b/render/json_test.go index 676b6bd00..fb2178621 100644 --- a/render/json_test.go +++ b/render/json_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/stretchr/testify/require" ) diff --git a/render/markdown_test.go b/render/markdown_test.go index d1642352e..28ffae346 100644 --- a/render/markdown_test.go +++ b/render/markdown_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/stretchr/testify/require" ) diff --git a/render/options.go b/render/options.go index cf57f8732..41235e0b8 100644 --- a/render/options.go +++ b/render/options.go @@ -1,6 +1,6 @@ package render -import "github.com/markbates/buffalo/render/resolvers" +import "github.com/gobuffalo/buffalo/render/resolvers" // Options for render.Engine type Options struct { diff --git a/render/render.go b/render/render.go index e4e496a14..6f2aaca81 100644 --- a/render/render.go +++ b/render/render.go @@ -4,8 +4,8 @@ import ( "sync" "github.com/aymerick/raymond" - "github.com/markbates/buffalo/render/helpers" - "github.com/markbates/buffalo/render/resolvers" + "github.com/gobuffalo/buffalo/render/helpers" + "github.com/gobuffalo/buffalo/render/resolvers" ) // Engine used to power all defined renderers. @@ -21,7 +21,7 @@ type Engine struct { // New render.Engine ready to go with your Options // and some defaults we think you might like. Engines // have the following helpers added to them: -// https://github.com/markbates/buffalo/blob/master/render/helpers/helpers.go#L1 +// https://github.com/gobuffalo/buffalo/blob/master/render/helpers/helpers.go#L1 // https://github.com/markbates/inflect/blob/master/helpers.go#L3 func New(opts Options) *Engine { if opts.Helpers == nil { diff --git a/render/string_test.go b/render/string_test.go index c88ea6fb9..dd6d33bb5 100644 --- a/render/string_test.go +++ b/render/string_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/stretchr/testify/require" ) diff --git a/render/template_test.go b/render/template_test.go index 3f03b183a..577606ee8 100644 --- a/render/template_test.go +++ b/render/template_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/stretchr/testify/require" ) diff --git a/render/xml_test.go b/render/xml_test.go index 213e6c5c6..6e0df6fa7 100644 --- a/render/xml_test.go +++ b/render/xml_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/stretchr/testify/require" ) diff --git a/router_test.go b/router_test.go index c0213a7e4..a5f0a769d 100644 --- a/router_test.go +++ b/router_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/markbates/buffalo/render" + "github.com/gobuffalo/buffalo/render" "github.com/markbates/willie" "github.com/stretchr/testify/require" )