Skip to content

Commit 375a0a9

Browse files
grokifygrokify
committed
dep: go mod: update
1 parent b639dc3 commit 375a0a9

File tree

6 files changed

+26
-23
lines changed

6 files changed

+26
-23
lines changed

‎examples/openapi3table/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io/ioutil"
66
"log"
77

8-
"github.com/grokify/gocharts/data/table"
8+
"github.com/grokify/gocharts/data/table/tabulator"
99
"github.com/grokify/spectrum/openapi3"
1010
"github.com/grokify/spectrum/openapi3/openapi3html"
1111
"github.com/jessevdk/go-flags"
@@ -46,8 +46,8 @@ func main() {
4646
fmt.Println("DONE")
4747
}
4848

49-
func ColumnTexts() *table.ColumnSet {
50-
columns := []table.Column{
49+
func ColumnTexts() *tabulator.ColumnSet {
50+
columns := []tabulator.Column{
5151
{
5252
Display: "Method",
5353
Slug: "method"},
@@ -79,5 +79,5 @@ func ColumnTexts() *table.ColumnSet {
7979
Display: "Docs Level",
8080
Slug: "x-docs-level"},
8181
}
82-
return &table.ColumnSet{Columns: columns}
82+
return &tabulator.ColumnSet{Columns: columns}
8383
}

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/buaazp/fasthttprouter v0.1.1
77
github.com/getkin/kin-openapi v0.66.0
88
github.com/ghodss/yaml v1.0.0
9-
github.com/grokify/gocharts v1.12.0
10-
github.com/grokify/simplego v0.28.1
9+
github.com/grokify/gocharts v1.13.0
10+
github.com/grokify/simplego v0.28.2
1111
github.com/jessevdk/go-flags v1.5.0
1212
github.com/pkg/errors v0.9.1
1313
github.com/rs/zerolog v1.23.0

‎go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,12 @@ github.com/grokify/base36 v1.0.2 h1:Zp3aif3ugpd4fusf46t43MqMkYeJRoxqEhRsNmP1EwQ=
201201
github.com/grokify/base36 v1.0.2/go.mod h1:A0Pzze8AN96L1APGKrZu4Qtuyvcf3tf4oQZfGbdhMPc=
202202
github.com/grokify/bitcoinmath v0.0.0-20171208015713-6ef5b53bef73/go.mod h1:FrFkuJ9mhcBuUZBBN5m3J5ihG6cvRsiBHwSXO15kOPc=
203203
github.com/grokify/elastirad-go v0.1.2/go.mod h1:EKkozVVN3RkQ7neSu974z4BNSeuhRqPy9ZSGD13+P3A=
204-
github.com/grokify/gocharts v1.12.0 h1:TLX/CGUYhLZB9ZlbxoMQe449Ucdu21uWdhebrTsW5MU=
205-
github.com/grokify/gocharts v1.12.0/go.mod h1:l77R7kRNJxwyiPGrAFIL1ozEP6g7NGaON4CLTwqynVw=
204+
github.com/grokify/gocharts v1.13.0 h1:YatDsL6qAhAEr8ezAAxGfGsJajfFbmwpyHB0kBT3ddA=
205+
github.com/grokify/gocharts v1.13.0/go.mod h1:l77R7kRNJxwyiPGrAFIL1ozEP6g7NGaON4CLTwqynVw=
206206
github.com/grokify/simplego v0.27.2/go.mod h1:UKobvO2/X3aFy5fwNUxaW6YFK8A3IKCoIRqtVNhsdZU=
207-
github.com/grokify/simplego v0.28.1 h1:TVg+jVk/XNpf4iYvVdAnIMvJZHuwajOI8ByWMBSbwPo=
208207
github.com/grokify/simplego v0.28.1/go.mod h1:UKobvO2/X3aFy5fwNUxaW6YFK8A3IKCoIRqtVNhsdZU=
208+
github.com/grokify/simplego v0.28.2 h1:VhWT/Z5KFdUBLgMrgMt3yhdVw+iIbgG3pLUwZE+oCg8=
209+
github.com/grokify/simplego v0.28.2/go.mod h1:UKobvO2/X3aFy5fwNUxaW6YFK8A3IKCoIRqtVNhsdZU=
209210
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
210211
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
211212
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=

‎openapi3/merge_options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"regexp"
66

77
oas3 "github.com/getkin/kin-openapi/openapi3"
8-
"github.com/grokify/gocharts/data/table"
8+
"github.com/grokify/gocharts/data/table/tabulator"
99
)
1010

1111
type CollisionCheckResult int
@@ -23,7 +23,7 @@ type MergeOptions struct {
2323
CollisionCheckResult CollisionCheckResult
2424
ValidateEach bool
2525
ValidateFinal bool
26-
TableColumns *table.ColumnSet
26+
TableColumns *tabulator.ColumnSet
2727
TableOpFilterFunc func(path, method string, op *oas3.Operation) bool
2828
}
2929

‎openapi3/openapi3html/pageparams.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
oas3 "github.com/getkin/kin-openapi/openapi3"
1111
"github.com/grokify/gocharts/data/table"
12+
"github.com/grokify/gocharts/data/table/tabulator"
1213
"github.com/grokify/spectrum/openapi3"
1314
)
1415

@@ -17,7 +18,7 @@ type PageParams struct {
1718
PageLink string
1819
TableDomID string
1920
Spec *openapi3.Spec
20-
ColumnSet *table.ColumnSet
21+
ColumnSet *tabulator.ColumnSet
2122
OpsFilterFunc func(path, method string, op *oas3.Operation) bool
2223
TableJSON []byte
2324
}
@@ -64,10 +65,10 @@ func (pp *PageParams) TableJSONBytesOrEmpty() []byte {
6465
func (pp *PageParams) TabulatorColumnsJSONBytesOrEmpty() []byte {
6566
if pp.ColumnSet == nil || len(pp.ColumnSet.Columns) == 0 {
6667
colSet := openapi3.OpTableColumnsDefault(false)
67-
tcols := table.BuildColumnsTabulator(colSet.Columns)
68+
tcols := tabulator.BuildColumnsTabulator(colSet.Columns)
6869
return tcols.MustColumnsJSON()
6970
}
70-
tcols := table.BuildColumnsTabulator(pp.ColumnSet.Columns)
71+
tcols := tabulator.BuildColumnsTabulator(pp.ColumnSet.Columns)
7172
return tcols.MustColumnsJSON()
7273
}
7374

‎openapi3/spec_more.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
oas3 "github.com/getkin/kin-openapi/openapi3"
1212
"github.com/grokify/gocharts/data/histogram"
1313
"github.com/grokify/gocharts/data/table"
14+
"github.com/grokify/gocharts/data/table/tabulator"
1415
"github.com/grokify/simplego/encoding/jsonutil"
1516
"github.com/grokify/simplego/net/urlutil"
1617
"github.com/grokify/simplego/type/stringsutil"
@@ -41,11 +42,11 @@ func (sm *SpecMore) SchemasCount() int {
4142
return len(sm.Spec.Components.Schemas)
4243
}
4344

44-
func (sm *SpecMore) OperationsTable(columns *table.ColumnSet, filterFunc func(path, method string, op *oas3.Operation) bool) (*table.Table, error) {
45+
func (sm *SpecMore) OperationsTable(columns *tabulator.ColumnSet, filterFunc func(path, method string, op *oas3.Operation) bool) (*table.Table, error) {
4546
return operationsTable(sm.Spec, columns, filterFunc)
4647
}
4748

48-
func operationsTable(spec *Spec, columns *table.ColumnSet, filterFunc func(path, method string, op *oas3.Operation) bool) (*table.Table, error) {
49+
func operationsTable(spec *Spec, columns *tabulator.ColumnSet, filterFunc func(path, method string, op *oas3.Operation) bool) (*table.Table, error) {
4950
if columns == nil {
5051
columns = OpTableColumnsDefault(false)
5152
}
@@ -99,8 +100,8 @@ func operationsTable(spec *Spec, columns *table.ColumnSet, filterFunc func(path,
99100
return &tbl, nil
100101
}
101102

102-
func OpTableColumnsDefault(inclDocsURL bool) *table.ColumnSet {
103-
cols := []table.Column{
103+
func OpTableColumnsDefault(inclDocsURL bool) *tabulator.ColumnSet {
104+
cols := []tabulator.Column{
104105
{
105106
Display: "Tags",
106107
Slug: "tags",
@@ -131,17 +132,17 @@ func OpTableColumnsDefault(inclDocsURL bool) *table.ColumnSet {
131132
Width: 150},
132133
}
133134
if inclDocsURL {
134-
cols = append(cols, table.Column{
135+
cols = append(cols, tabulator.Column{
135136
Display: "DocsURL",
136137
Slug: "docsURL",
137138
Width: 150})
138139
}
139-
return &table.ColumnSet{Columns: cols}
140+
return &tabulator.ColumnSet{Columns: cols}
140141
}
141142

142-
func OpTableColumnsRingCentral() *table.ColumnSet {
143+
func OpTableColumnsRingCentral() *tabulator.ColumnSet {
143144
columns := OpTableColumnsDefault(false)
144-
rcCols := []table.Column{
145+
rcCols := []tabulator.Column{
145146
{
146147
Display: "API Group",
147148
Slug: "x-api-group",
@@ -485,7 +486,7 @@ func (sm *SpecMore) WriteFileJSON(filename string, perm os.FileMode, prefix, ind
485486
return ioutil.WriteFile(filename, jsonData, perm)
486487
}
487488

488-
func (sm *SpecMore) WriteFileXLSX(filename string, columns *table.ColumnSet, filterFunc func(path, method string, op *oas3.Operation) bool) error {
489+
func (sm *SpecMore) WriteFileXLSX(filename string, columns *tabulator.ColumnSet, filterFunc func(path, method string, op *oas3.Operation) bool) error {
489490
if columns == nil {
490491
columns = OpTableColumnsDefault(true)
491492
}

0 commit comments

Comments
 (0)