From 8a8fef47498252f365848db3906c3a060dee40b9 Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Wed, 8 May 2019 14:40:21 -0500 Subject: [PATCH 01/12] Update spec.go to add Title properties Update the loadSpec method to add a Title for any definition that does not have one. --- spec/spec.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/spec.go b/spec/spec.go index da38f08..41f6d82 100644 --- a/spec/spec.go +++ b/spec/spec.go @@ -1396,6 +1396,16 @@ func loadSpec(url string) (*loads.Document, error) { return nil, err } + // Because Title is required for resources but optional in the Open API spec, add the Title here for any definitions missing one + definitions := document.Spec().Definitions + for name, definition := range definitions { + if definition.Title == "" { + definition.Title = name + definitions[name] = definition + logger.Tracef(nil, "Definition for %s missing Title, setting Title to \"%s\"", name, definition.Title) + } + } + //options := &spec.ExpandOptions{ // RelativeBase: "/Users/csmith1/src/go/src/github.com/dapperdox/dapperdox-demo/specifications", //} From 05c794561be694bad857596d91e10f0deb28d9ed Mon Sep 17 00:00:00 2001 From: Dean Harrington Date: Fri, 10 May 2019 11:00:01 -0500 Subject: [PATCH 02/12] Changed to use fixed version of spec --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 6bf9db0..c2285eb 100644 --- a/main.go +++ b/main.go @@ -36,7 +36,7 @@ import ( "github.com/dapperdox/dapperdox/network" "github.com/dapperdox/dapperdox/proxy" "github.com/dapperdox/dapperdox/render" - "github.com/dapperdox/dapperdox/spec" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" "github.com/justinas/alice" "github.com/justinas/nosurf" From c5c28f4743b75a7f3da872edc21d8d424854d934 Mon Sep 17 00:00:00 2001 From: Aaron Frink Date: Fri, 10 May 2019 11:58:10 -0500 Subject: [PATCH 03/12] Change references to /spec to not use mainline dapperdox. --- handlers/guides/guides.go | 2 +- handlers/home/home.go | 2 +- handlers/reference/reference.go | 2 +- main.go | 2 +- render/render.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/handlers/guides/guides.go b/handlers/guides/guides.go index 89466ab..392d427 100644 --- a/handlers/guides/guides.go +++ b/handlers/guides/guides.go @@ -29,7 +29,7 @@ import ( "github.com/dapperdox/dapperdox/navigation" "github.com/dapperdox/dapperdox/render" "github.com/dapperdox/dapperdox/render/asset" - "github.com/dapperdox/dapperdox/spec" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/home/home.go b/handlers/home/home.go index 722a780..85249a6 100644 --- a/handlers/home/home.go +++ b/handlers/home/home.go @@ -23,7 +23,7 @@ import ( "github.com/dapperdox/dapperdox/config" "github.com/dapperdox/dapperdox/logger" "github.com/dapperdox/dapperdox/render" - "github.com/dapperdox/dapperdox/spec" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/reference/reference.go b/handlers/reference/reference.go index f321058..16d3ba8 100644 --- a/handlers/reference/reference.go +++ b/handlers/reference/reference.go @@ -23,7 +23,7 @@ import ( //"github.com/davecgh/go-spew/spew" "github.com/dapperdox/dapperdox/logger" "github.com/dapperdox/dapperdox/render" - "github.com/dapperdox/dapperdox/spec" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/main.go b/main.go index 6bf9db0..c2285eb 100644 --- a/main.go +++ b/main.go @@ -36,7 +36,7 @@ import ( "github.com/dapperdox/dapperdox/network" "github.com/dapperdox/dapperdox/proxy" "github.com/dapperdox/dapperdox/render" - "github.com/dapperdox/dapperdox/spec" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" "github.com/justinas/alice" "github.com/justinas/nosurf" diff --git a/render/render.go b/render/render.go index 09555ea..938ae25 100644 --- a/render/render.go +++ b/render/render.go @@ -29,7 +29,7 @@ import ( "github.com/dapperdox/dapperdox/logger" "github.com/dapperdox/dapperdox/navigation" "github.com/dapperdox/dapperdox/render/asset" - "github.com/dapperdox/dapperdox/spec" + "github.com/frinka/dapperdox/spec" "github.com/ian-kent/htmlform" "github.com/unrolled/render" ) From 942a379d7d0e5adaadebae5a2978120da2961905 Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Fri, 10 May 2019 12:09:03 -0500 Subject: [PATCH 04/12] Use forked repo for spec changes. --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index c2285eb..0827276 100644 --- a/main.go +++ b/main.go @@ -26,16 +26,16 @@ import ( "time" "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/handlers/guides" - "github.com/dapperdox/dapperdox/handlers/home" - "github.com/dapperdox/dapperdox/handlers/reference" "github.com/dapperdox/dapperdox/handlers/specs" "github.com/dapperdox/dapperdox/handlers/static" "github.com/dapperdox/dapperdox/handlers/timeout" "github.com/dapperdox/dapperdox/logger" "github.com/dapperdox/dapperdox/network" "github.com/dapperdox/dapperdox/proxy" - "github.com/dapperdox/dapperdox/render" + "github.com/frinka/dapperdox/handlers/guides" + "github.com/frinka/dapperdox/handlers/home" + "github.com/frinka/dapperdox/handlers/reference" + "github.com/frinka/dapperdox/render" "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" "github.com/justinas/alice" From 02eeb03966075965239cb669579781a7db3c3b05 Mon Sep 17 00:00:00 2001 From: Aaron Frink Date: Fri, 10 May 2019 12:35:51 -0500 Subject: [PATCH 05/12] Change all dapperdox github dependencies to be local packages instead. --- config/config.go | 2 +- handlers/guides/guides.go | 10 +++++----- handlers/home/home.go | 8 ++++---- handlers/reference/reference.go | 6 +++--- handlers/specs/specs.go | 4 ++-- handlers/static/static.go | 8 ++++---- handlers/timeout/timeout.go | 2 +- main.go | 26 ++++++++++++++------------ network/network.go | 4 ++-- proxy/proxy.go | 4 ++-- render/asset/asset.go | 4 ++-- render/render.go | 10 +++++----- spec/spec.go | 6 +++--- spec/statuscodes.go | 4 ++-- 14 files changed, 50 insertions(+), 48 deletions(-) diff --git a/config/config.go b/config/config.go index 4a06920..b9b517d 100644 --- a/config/config.go +++ b/config/config.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/logger" "github.com/ian-kent/gofigure" ) diff --git a/handlers/guides/guides.go b/handlers/guides/guides.go index 392d427..1405577 100644 --- a/handlers/guides/guides.go +++ b/handlers/guides/guides.go @@ -25,11 +25,11 @@ import ( "sort" "strings" - "github.com/dapperdox/dapperdox/logger" - "github.com/dapperdox/dapperdox/navigation" - "github.com/dapperdox/dapperdox/render" - "github.com/dapperdox/dapperdox/render/asset" - "github.com/frinka/dapperdox/spec" + "dapperdox/logger" + "dapperdox/navigation" + "dapperdox/render" + "dapperdox/render/asset" + "dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/home/home.go b/handlers/home/home.go index 85249a6..9e02443 100644 --- a/handlers/home/home.go +++ b/handlers/home/home.go @@ -20,10 +20,10 @@ package home import ( "net/http" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" - "github.com/dapperdox/dapperdox/render" - "github.com/frinka/dapperdox/spec" + "dapperdox/config" + "dapperdox/logger" + "dapperdox/render" + "dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/reference/reference.go b/handlers/reference/reference.go index 16d3ba8..c7678bb 100644 --- a/handlers/reference/reference.go +++ b/handlers/reference/reference.go @@ -21,9 +21,9 @@ import ( "net/http" //"github.com/davecgh/go-spew/spew" - "github.com/dapperdox/dapperdox/logger" - "github.com/dapperdox/dapperdox/render" - "github.com/frinka/dapperdox/spec" + "dapperdox/logger" + "dapperdox/render" + "dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/specs/specs.go b/handlers/specs/specs.go index c914b95..d87af58 100644 --- a/handlers/specs/specs.go +++ b/handlers/specs/specs.go @@ -24,8 +24,8 @@ import ( "path/filepath" "strings" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/config" + "dapperdox/logger" "github.com/gorilla/pat" ) diff --git a/handlers/static/static.go b/handlers/static/static.go index a6ca440..46a39e0 100644 --- a/handlers/static/static.go +++ b/handlers/static/static.go @@ -23,10 +23,10 @@ import ( "path/filepath" "strings" - //"github.com/dapperdox/dapperdox/assets" - "github.com/dapperdox/dapperdox/logger" - "github.com/dapperdox/dapperdox/render" - "github.com/dapperdox/dapperdox/render/asset" + //"dapperdox/assets" + "dapperdox/logger" + "dapperdox/render" + "dapperdox/render/asset" "github.com/gorilla/pat" ) diff --git a/handlers/timeout/timeout.go b/handlers/timeout/timeout.go index 046a30a..ddf7e68 100644 --- a/handlers/timeout/timeout.go +++ b/handlers/timeout/timeout.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/logger" ) // Handler returns a Handler that runs h with the given time limit. diff --git a/main.go b/main.go index 0827276..df507ef 100644 --- a/main.go +++ b/main.go @@ -25,18 +25,20 @@ import ( "sync" "time" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/handlers/specs" - "github.com/dapperdox/dapperdox/handlers/static" - "github.com/dapperdox/dapperdox/handlers/timeout" - "github.com/dapperdox/dapperdox/logger" - "github.com/dapperdox/dapperdox/network" - "github.com/dapperdox/dapperdox/proxy" - "github.com/frinka/dapperdox/handlers/guides" - "github.com/frinka/dapperdox/handlers/home" - "github.com/frinka/dapperdox/handlers/reference" - "github.com/frinka/dapperdox/render" - "github.com/frinka/dapperdox/spec" + "dapperdox/spec" + + "dapperdox/config" + "dapperdox/handlers/guides" + "dapperdox/handlers/home" + "dapperdox/handlers/reference" + "dapperdox/handlers/specs" + "dapperdox/handlers/static" + "dapperdox/handlers/timeout" + "dapperdox/logger" + "dapperdox/network" + "dapperdox/proxy" + "dapperdox/render" + "github.com/gorilla/pat" "github.com/justinas/alice" "github.com/justinas/nosurf" diff --git a/network/network.go b/network/network.go index dc9a440..f609b5d 100644 --- a/network/network.go +++ b/network/network.go @@ -20,8 +20,8 @@ package network import ( "crypto/tls" "errors" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/config" + "dapperdox/logger" "net" ) diff --git a/proxy/proxy.go b/proxy/proxy.go index 04d01f9..8b15586 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -18,8 +18,8 @@ along with this program. If not, see . package proxy import ( - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/config" + "dapperdox/logger" "github.com/gorilla/pat" "net/http" "net/http/httputil" diff --git a/render/asset/asset.go b/render/asset/asset.go index 51fc372..9ce82dc 100644 --- a/render/asset/asset.go +++ b/render/asset/asset.go @@ -29,8 +29,8 @@ import ( "fmt" "regexp" //"github.com/davecgh/go-spew/spew" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/config" + "dapperdox/logger" "github.com/shurcooL/github_flavored_markdown" "io/ioutil" "os" diff --git a/render/render.go b/render/render.go index 938ae25..7e75235 100644 --- a/render/render.go +++ b/render/render.go @@ -25,11 +25,11 @@ import ( "strings" //"github.com/davecgh/go-spew/spew" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" - "github.com/dapperdox/dapperdox/navigation" - "github.com/dapperdox/dapperdox/render/asset" - "github.com/frinka/dapperdox/spec" + "dapperdox/config" + "dapperdox/logger" + "dapperdox/navigation" + "dapperdox/render/asset" + "dapperdox/spec" "github.com/ian-kent/htmlform" "github.com/unrolled/render" ) diff --git a/spec/spec.go b/spec/spec.go index 41f6d82..40c7939 100644 --- a/spec/spec.go +++ b/spec/spec.go @@ -27,8 +27,8 @@ import ( "sort" "strings" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/config" + "dapperdox/logger" //"github.com/davecgh/go-spew/spew" "github.com/go-openapi/loads" "github.com/go-openapi/spec" @@ -1407,7 +1407,7 @@ func loadSpec(url string) (*loads.Document, error) { } //options := &spec.ExpandOptions{ - // RelativeBase: "/Users/csmith1/src/go/src/github.com/dapperdox/dapperdox-demo/specifications", + // RelativeBase: "/Users/csmith1/src/go/src/dapperdox-demo/specifications", //} // TODO Allow relative references https://github.com/go-openapi/spec/issues/14 diff --git a/spec/statuscodes.go b/spec/statuscodes.go index d6dcc38..d5b07f1 100644 --- a/spec/statuscodes.go +++ b/spec/statuscodes.go @@ -19,8 +19,8 @@ package spec import ( "bufio" - "github.com/dapperdox/dapperdox/config" - "github.com/dapperdox/dapperdox/logger" + "dapperdox/config" + "dapperdox/logger" "os" "regexp" "strconv" From d292ae1d37acf5657ddb1cc28c6cfd5f589eee71 Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Fri, 10 May 2019 12:41:09 -0500 Subject: [PATCH 06/12] Increment version (Dapperdox/dapperdox is at 1.2.2) --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index df507ef..1ed7ba5 100644 --- a/main.go +++ b/main.go @@ -44,7 +44,7 @@ import ( "github.com/justinas/nosurf" ) -var VERSION string = "1.2.1" +var VERSION string = "1.2.3" var tlsEnabled bool // --------------------------------------------------------------------------- From 1dc777b6e1220a13a573bb00d0e160af5fa97b55 Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Wed, 15 May 2019 09:28:22 -0500 Subject: [PATCH 07/12] Update to more recent version of go. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 503b986..2baee40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: go go: - - 1.7.3 + - 1.10.4 - tip From 5011ef00937e34922497788b149fd00d16d0c3f9 Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Wed, 15 May 2019 09:34:10 -0500 Subject: [PATCH 08/12] Quote version for so it's not read as a float. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2baee40..82328fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: go go: - - 1.10.4 + - "1.10.4" - tip From c0d13720bc731161bc2cee3d2fb734c07f39e84f Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Wed, 15 May 2019 13:26:18 -0500 Subject: [PATCH 09/12] Override import path to not point to github.com. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82328fd..1d253c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: go go: - "1.10.4" - - tip +go_import_path: frinka/dapperdox From c0e071f5aa0b9edb41443e46a991ca46aa53e761 Mon Sep 17 00:00:00 2001 From: Aaron Frink Date: Wed, 15 May 2019 14:56:29 -0500 Subject: [PATCH 10/12] Revert dependencies to github.com style. --- config/config.go | 7 +++++-- createReleaseTable.sh | 2 +- handlers/guides/guides.go | 10 +++++----- handlers/home/home.go | 10 +++++----- handlers/reference/reference.go | 8 ++++---- handlers/specs/specs.go | 6 +++--- handlers/static/static.go | 8 ++++---- handlers/timeout/timeout.go | 4 ++-- main.go | 33 +++++++++++++++++++-------------- network/network.go | 7 ++++--- proxy/proxy.go | 9 +++++---- render/asset/asset.go | 10 ++++++---- render/render.go | 12 ++++++------ spec/spec.go | 32 +++++++++++++++++++++++++++++--- spec/statuscodes.go | 7 ++++--- 15 files changed, 102 insertions(+), 63 deletions(-) diff --git a/config/config.go b/config/config.go index b9b517d..d047d89 100644 --- a/config/config.go +++ b/config/config.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,8 @@ import ( "reflect" "strings" - "dapperdox/logger" + "github.com/frinka/dapperdox/logger" + "github.com/ian-kent/gofigure" ) @@ -32,6 +33,7 @@ type config struct { DefaultAssetsDir string `env:"DEFAULT_ASSETS_DIR" flag:"default-assets-dir" flagDesc:"Default assets."` SpecDir string `env:"SPEC_DIR" flag:"spec-dir" flagDesc:"OpenAPI specification (swagger) directory"` SpecFilename []string `env:"SPEC_FILENAME" flag:"spec-filename" flagDesc:"The filename of the OpenAPI specification file within the spec-dir. May be multiply defined. Defaults to spec/swagger.json"` + SpecURL string `env:"SPEC_URL" flag:"spec-url" flagDesc:"OpenAPI specification (swagger) server url"` Theme string `env:"THEME" flag:"theme" flagDesc:"Theme to render documentation"` ThemeDir string `env:"THEME_DIR" flag:"theme-dir" flagDesc:"Directory containing installed themes"` LogLevel string `env:"LOGLEVEL" flag:"log-level" flagDesc:"Log level"` @@ -56,6 +58,7 @@ func Get() (*config, error) { cfg = &config{ BindAddr: "localhost:3123", SpecDir: "", + SpecURL: "", DefaultAssetsDir: "assets", LogLevel: "info", SiteURL: "http://localhost:3123/", diff --git a/createReleaseTable.sh b/createReleaseTable.sh index dc46b6e..ecf8b38 100755 --- a/createReleaseTable.sh +++ b/createReleaseTable.sh @@ -23,5 +23,5 @@ do TARG=`echo $i | cut -d'.' -f4` OS=`echo $TARG | cut -d'-' -f1` ARCH=`echo $TARG | cut -d'-' -f2` - echo "[$i](https://github.com/DapperDox/dapperdox/releases/download/v$VERSION/$i) | ${OS} | ${ARCH} | ${SIZE} | ${SUM} |" + echo "[$i](https://github.com/frinka/dapperdox/releases/download/v$VERSION/$i) | ${OS} | ${ARCH} | ${SIZE} | ${SUM} |" done diff --git a/handlers/guides/guides.go b/handlers/guides/guides.go index 1405577..2d164b5 100644 --- a/handlers/guides/guides.go +++ b/handlers/guides/guides.go @@ -25,11 +25,11 @@ import ( "sort" "strings" - "dapperdox/logger" - "dapperdox/navigation" - "dapperdox/render" - "dapperdox/render/asset" - "dapperdox/spec" + "github.com/frinka/dapperdox/logger" + "github.com/frinka/dapperdox/navigation" + "github.com/frinka/dapperdox/render" + "github.com/frinka/dapperdox/render/asset" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/home/home.go b/handlers/home/home.go index 9e02443..414d0dd 100644 --- a/handlers/home/home.go +++ b/handlers/home/home.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,10 +20,10 @@ package home import ( "net/http" - "dapperdox/config" - "dapperdox/logger" - "dapperdox/render" - "dapperdox/spec" + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/logger" + "github.com/frinka/dapperdox/render" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/reference/reference.go b/handlers/reference/reference.go index c7678bb..ca0d7fd 100644 --- a/handlers/reference/reference.go +++ b/handlers/reference/reference.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,9 +21,9 @@ import ( "net/http" //"github.com/davecgh/go-spew/spew" - "dapperdox/logger" - "dapperdox/render" - "dapperdox/spec" + "github.com/frinka/dapperdox/logger" + "github.com/frinka/dapperdox/render" + "github.com/frinka/dapperdox/spec" "github.com/gorilla/pat" ) diff --git a/handlers/specs/specs.go b/handlers/specs/specs.go index d87af58..a9521a9 100644 --- a/handlers/specs/specs.go +++ b/handlers/specs/specs.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,8 +24,8 @@ import ( "path/filepath" "strings" - "dapperdox/config" - "dapperdox/logger" + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/logger" "github.com/gorilla/pat" ) diff --git a/handlers/static/static.go b/handlers/static/static.go index 46a39e0..8d0ab5d 100644 --- a/handlers/static/static.go +++ b/handlers/static/static.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,9 +24,9 @@ import ( "strings" //"dapperdox/assets" - "dapperdox/logger" - "dapperdox/render" - "dapperdox/render/asset" + "github.com/frinka/dapperdox/logger" + "github.com/frinka/dapperdox/render" + "github.com/frinka/dapperdox/render/asset" "github.com/gorilla/pat" ) diff --git a/handlers/timeout/timeout.go b/handlers/timeout/timeout.go index ddf7e68..5a1ed21 100644 --- a/handlers/timeout/timeout.go +++ b/handlers/timeout/timeout.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ import ( "sync" "time" - "dapperdox/logger" + "github.com/frinka/dapperdox/logger" ) // Handler returns a Handler that runs h with the given time limit. diff --git a/main.go b/main.go index df507ef..412210f 100644 --- a/main.go +++ b/main.go @@ -25,19 +25,19 @@ import ( "sync" "time" - "dapperdox/spec" - - "dapperdox/config" - "dapperdox/handlers/guides" - "dapperdox/handlers/home" - "dapperdox/handlers/reference" - "dapperdox/handlers/specs" - "dapperdox/handlers/static" - "dapperdox/handlers/timeout" - "dapperdox/logger" - "dapperdox/network" - "dapperdox/proxy" - "dapperdox/render" + "github.com/frinka/dapperdox/spec" + + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/handlers/guides" + "github.com/frinka/dapperdox/handlers/home" + "github.com/frinka/dapperdox/handlers/reference" + "github.com/frinka/dapperdox/handlers/specs" + "github.com/frinka/dapperdox/handlers/static" + "github.com/frinka/dapperdox/handlers/timeout" + "github.com/frinka/dapperdox/logger" + "github.com/frinka/dapperdox/network" + "github.com/frinka/dapperdox/proxy" + "github.com/frinka/dapperdox/render" "github.com/gorilla/pat" "github.com/justinas/alice" @@ -96,7 +96,12 @@ func main() { specs.Register(router) spec.LoadStatusCodes() - err = spec.LoadSpecifications(cfg.BindAddr, true) + if cfg.SpecURL != "" { + err = spec.LoadSpecification(cfg.SpecURL) + } else { + err = spec.LoadSpecifications(cfg.BindAddr, true) + } + if err != nil { logger.Errorf(nil, "Load specification error: %s", err) os.Exit(1) diff --git a/network/network.go b/network/network.go index f609b5d..0f1164e 100644 --- a/network/network.go +++ b/network/network.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,9 +20,10 @@ package network import ( "crypto/tls" "errors" - "dapperdox/config" - "dapperdox/logger" "net" + + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/logger" ) func GetListener(tlsEnabled *bool) (net.Listener, error) { diff --git a/proxy/proxy.go b/proxy/proxy.go index 8b15586..4efb510 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,14 +18,15 @@ along with this program. If not, see . package proxy import ( - "dapperdox/config" - "dapperdox/logger" - "github.com/gorilla/pat" "net/http" "net/http/httputil" "net/url" "strings" "time" + + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/logger" + "github.com/gorilla/pat" ) type responseCapture struct { diff --git a/render/asset/asset.go b/render/asset/asset.go index 9ce82dc..eb17c22 100644 --- a/render/asset/asset.go +++ b/render/asset/asset.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,15 +28,17 @@ import ( "bytes" "fmt" "regexp" + //"github.com/davecgh/go-spew/spew" - "dapperdox/config" - "dapperdox/logger" - "github.com/shurcooL/github_flavored_markdown" "io/ioutil" "os" "path/filepath" "strings" "unicode" + + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/logger" + "github.com/shurcooL/github_flavored_markdown" ) var _bindata = map[string][]byte{} diff --git a/render/render.go b/render/render.go index 7e75235..8a7af88 100644 --- a/render/render.go +++ b/render/render.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,11 +25,11 @@ import ( "strings" //"github.com/davecgh/go-spew/spew" - "dapperdox/config" - "dapperdox/logger" - "dapperdox/navigation" - "dapperdox/render/asset" - "dapperdox/spec" + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/logger" + "github.com/frinka/dapperdox/navigation" + "github.com/frinka/dapperdox/render/asset" + "github.com/frinka/dapperdox/spec" "github.com/ian-kent/htmlform" "github.com/unrolled/render" ) diff --git a/spec/spec.go b/spec/spec.go index 40c7939..98cc26e 100644 --- a/spec/spec.go +++ b/spec/spec.go @@ -27,8 +27,10 @@ import ( "sort" "strings" - "dapperdox/config" - "dapperdox/logger" + "github.com/frinka/dapperdox/config" + + "github.com/frinka/dapperdox/logger" + //"github.com/davecgh/go-spew/spew" "github.com/go-openapi/loads" "github.com/go-openapi/spec" @@ -293,6 +295,30 @@ func LoadSpecifications(specHost string, collapse bool) error { return nil } +// +++++++++++++++++++++++++++++++++++++++++++++ +// Load spec from a url +func LoadSpecification(specUrl string) error { + if APISuite == nil { + APISuite = make(map[string]*APISpecification) + } + + var ok bool + var specification *APISpecification + + if specification, ok = APISuite[""]; !ok { + specification = &APISpecification{} + } + + var err = specification.Load(specUrl, "") + if err != nil { + return err + } + + APISuite[specification.ID] = specification + + return nil +} + // ----------------------------------------------------------------------------- // Load loads API specs from the supplied host (usually local!) func (c *APISpecification) Load(specLocation string, specHost string) error { @@ -1405,7 +1431,7 @@ func loadSpec(url string) (*loads.Document, error) { logger.Tracef(nil, "Definition for %s missing Title, setting Title to \"%s\"", name, definition.Title) } } - + //options := &spec.ExpandOptions{ // RelativeBase: "/Users/csmith1/src/go/src/dapperdox-demo/specifications", //} diff --git a/spec/statuscodes.go b/spec/statuscodes.go index d5b07f1..5821df1 100644 --- a/spec/statuscodes.go +++ b/spec/statuscodes.go @@ -1,5 +1,5 @@ /* -Copyright (C) 2016-2017 dapperdox.com +Copyright (C) 2016-2017 dapperdox.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,11 +19,12 @@ package spec import ( "bufio" - "dapperdox/config" - "dapperdox/logger" "os" "regexp" "strconv" + + "github.com/frinka/dapperdox/config" + "github.com/frinka/dapperdox/logger" ) var statusMapSplit = regexp.MustCompile(",") From 575c4b03deff3ea70418728b4f261560b635871f Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Thu, 16 May 2019 11:34:04 -0500 Subject: [PATCH 11/12] Update readme to point to fork build and version. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67c91f6..52d51b2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# DapperDox   [![Build Status](https://travis-ci.org/DapperDox/dapperdox.svg?branch=master)](https://travis-ci.org/DapperDox/dapperdox) [![Download](https://img.shields.io/badge/release-v1.1.1-green.svg) ](https://github.com/DapperDox/dapperdox/releases/tag/v1.1.1) +# DapperDox   [![Build Status](https://travis-ci.org/frinka/dapperdox.svg?branch=master)](https://travis-ci.org/frinka/dapperdox) [![Download](https://img.shields.io/badge/release-v1.2.3green.svg) ](https://github.com/DapperDox/dapperdox/releases/tag/v1.1.1) ### Beautiful, integrated, OpenAPI documentation. From 21f075a58a6f61f06c8fcd227786166c6c72ece2 Mon Sep 17 00:00:00 2001 From: frinka <49955850+frinka@users.noreply.github.com> Date: Thu, 16 May 2019 11:36:55 -0500 Subject: [PATCH 12/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52d51b2..4496123 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# DapperDox   [![Build Status](https://travis-ci.org/frinka/dapperdox.svg?branch=master)](https://travis-ci.org/frinka/dapperdox) [![Download](https://img.shields.io/badge/release-v1.2.3green.svg) ](https://github.com/DapperDox/dapperdox/releases/tag/v1.1.1) +# DapperDox   [![Build Status](https://travis-ci.org/frinka/dapperdox.svg?branch=master)](https://travis-ci.org/frinka/dapperdox) [![Download](https://img.shields.io/badge/release-v1.2.3green.svg) ](https://github.com/frinka/dapperdox/releases/tag/v1.2.3) ### Beautiful, integrated, OpenAPI documentation.