Merge pull request #87 from daveshanley/libopenapi

Refactored vacuum to use pb33f shared libraries

cmd/dashboard.go

@@ -9,6 +9,8 @@ import (
 	"github.com/daveshanley/vacuum/model"
 	"github.com/daveshanley/vacuum/motor"
 	vacuum_report "github.com/daveshanley/vacuum/vacuum-report"
+	"github.com/pb33f/libopenapi/datamodel"
+	"github.com/pb33f/libopenapi/index"
 	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
@@ -37,8 +39,8 @@ func GetDashboardCommand() *cobra.Command {
 
 			var resultSet *model.RuleResultSet
 			var ruleset *motor.RuleSetExecutionResult
-			var specIndex *model.SpecIndex
-			var specInfo *model.SpecInfo
+			var specIndex *index.SpecIndex
+			var specInfo *datamodel.SpecInfo
 
 			// if we have a pre-compiled report, jump straight to the end and collect $500
 			if vacuumReport == nil {
@@ -65,7 +67,7 @@ func GetDashboardCommand() *cobra.Command {
 					pterm.Println()
 					return err
 				}
-				specIndex = model.NewSpecIndex(&rootNode)
+				specIndex = index.NewSpecIndex(&rootNode)
 				specInfo = vacuumReport.SpecInfo
 				specInfo.Generated = vacuumReport.Generated
 			}

cmd/html_report.go

@@ -11,6 +11,8 @@ import (
 	"github.com/daveshanley/vacuum/motor"
 	"github.com/daveshanley/vacuum/statistics"
 	vacuum_report "github.com/daveshanley/vacuum/vacuum-report"
+	"github.com/pb33f/libopenapi/datamodel"
+	"github.com/pb33f/libopenapi/index"
 	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
 	"io/ioutil"
@@ -55,8 +57,8 @@ func GetHTMLReportCommand() *cobra.Command {
 
 			var resultSet *model.RuleResultSet
 			var ruleset *motor.RuleSetExecutionResult
-			var specIndex *model.SpecIndex
-			var specInfo *model.SpecInfo
+			var specIndex *index.SpecIndex
+			var specInfo *datamodel.SpecInfo
 			var stats *reports.ReportStatistics
 
 			// if we have a pre-compiled report, jump straight to the end and collect $500

cui/dashboard.go

@@ -4,6 +4,8 @@ import (
 	"github.com/daveshanley/vacuum/model"
 	ui "github.com/gizak/termui/v3"
 	"github.com/gizak/termui/v3/widgets"
+	"github.com/pb33f/libopenapi/datamodel"
+	"github.com/pb33f/libopenapi/index"
 )
 
 // Dashboard represents the dashboard controlling container
@@ -17,8 +19,8 @@ type Dashboard struct {
 	healthGaugeItems            []ui.GridItem
 	categoryHealthGauge         []CategoryGauge
 	resultSet                   *model.RuleResultSet
-	index                       *model.SpecIndex
-	info                        *model.SpecInfo
+	index                       *index.SpecIndex
+	info                        *datamodel.SpecInfo
 	selectedTabIndex            int
 	ruleCategories              []*model.RuleCategory
 	selectedCategory            *model.RuleCategory
@@ -32,7 +34,7 @@ type Dashboard struct {
 	uiEvents                    <-chan ui.Event
 }
 
-func CreateDashboard(resultSet *model.RuleResultSet, index *model.SpecIndex, info *model.SpecInfo) *Dashboard {
+func CreateDashboard(resultSet *model.RuleResultSet, index *index.SpecIndex, info *datamodel.SpecInfo) *Dashboard {
 	db := new(Dashboard)
 	db.resultSet = resultSet
 	db.index = index

cui/dashboard_test.go

@@ -8,6 +8,8 @@ import (
 	"github.com/daveshanley/vacuum/motor"
 	"github.com/daveshanley/vacuum/rulesets"
 	ui "github.com/gizak/termui/v3"
+	"github.com/pb33f/libopenapi/datamodel"
+	"github.com/pb33f/libopenapi/index"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
@@ -111,14 +113,14 @@ func TestDashboard_Render(t *testing.T) {
 	//}
 }
 
-func testBootDashboard() (*model.RuleResultSet, *model.SpecIndex, *model.SpecInfo) {
+func testBootDashboard() (*model.RuleResultSet, *index.SpecIndex, *datamodel.SpecInfo) {
 	var rootNode yaml.Node
 	yamlBytes, _ := ioutil.ReadFile("../model/test_files/burgershop.openapi.yaml")
 
-	info, _ := model.ExtractSpecInfo(yamlBytes)
+	info, _ := datamodel.ExtractSpecInfo(yamlBytes)
 
 	yaml.Unmarshal(yamlBytes, &rootNode)
-	index := model.NewSpecIndex(&rootNode)
+	index := index.NewSpecIndex(&rootNode)
 
 	// let's go ahead and lint the spec and pass the results to the dashboard.
 	defaultRuleSets := rulesets.BuildDefaultRuleSets()

cui/stats_chart.go

@@ -2,9 +2,10 @@ package cui
 
 import (
 	"fmt"
-	"github.com/daveshanley/vacuum/model"
 	ui "github.com/gizak/termui/v3"
 	"github.com/gizak/termui/v3/widgets"
+	"github.com/pb33f/libopenapi/datamodel"
+	"github.com/pb33f/libopenapi/index"
 )
 
 // StatsChart represents a bar chart showing statistics of the specification.
@@ -13,7 +14,7 @@ type StatsChart struct {
 }
 
 // NewStatsChart returns a new gauge widget that is ready to render
-func NewStatsChart(index *model.SpecIndex, info *model.SpecInfo) StatsChart {
+func NewStatsChart(index *index.SpecIndex, info *datamodel.SpecInfo) StatsChart {
 	bc := widgets.NewList()
 
 	//paramCount := len(index.GetAllParameters()) index. + len(index.GetAllParametersFromOperations())

cui/stats_chart_test.go

@@ -4,7 +4,8 @@
 package cui
 
 import (
-	"github.com/daveshanley/vacuum/model"
+	"github.com/pb33f/libopenapi/datamodel"
+	"github.com/pb33f/libopenapi/index"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
@@ -15,9 +16,9 @@ func TestNewStatsChart(t *testing.T) {
 	var rootNode yaml.Node
 	yamlBytes, _ := ioutil.ReadFile("../model/test_files/burgershop.openapi.yaml")
 
-	info, _ := model.ExtractSpecInfo(yamlBytes)
+	info, _ := datamodel.ExtractSpecInfo(yamlBytes)
 	yaml.Unmarshal(yamlBytes, &rootNode)
-	index := model.NewSpecIndex(&rootNode)
+	index := index.NewSpecIndex(&rootNode)
 
 	chart := NewStatsChart(index, info)
 

functions/core/alphabetical.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 	"sort"
 	"strconv"

functions/core/alphabetical_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/casing.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 	"regexp"
 	"strconv"

functions/core/casing_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	gen_utils "github.com/daveshanley/vacuum/utils"
+	gen_utils "github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/defined.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 )
 

functions/core/defined_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/enumeration.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 	"strings"
 )

functions/core/enumeration_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/falsy.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 )
 

functions/core/falsy_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/length.go

@@ -5,7 +5,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 	"strconv"
 )

functions/core/length_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/pattern.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 	"regexp"
 )

functions/core/pattern_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/schema.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
 	"github.com/daveshanley/vacuum/parser"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 )
 

functions/core/schema_test.go

@@ -3,7 +3,7 @@ package core
 import (
 	"github.com/daveshanley/vacuum/model"
 	"github.com/daveshanley/vacuum/parser"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/truthy.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 )
 

functions/core/truthy_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/undefined.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 )
 

functions/core/undefined_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/core/xor.go

@@ -6,7 +6,7 @@ package core
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 	"strings"
 )

functions/core/xor_test.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

functions/openapi/component_descriptions.go

@@ -6,7 +6,7 @@ package openapi
 import (
 	"fmt"
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"gopkg.in/yaml.v3"
 	"strconv"
 	"strings"

functions/openapi/component_descriptions_test.go

@@ -2,7 +2,7 @@ package openapi
 
 import (
 	"github.com/daveshanley/vacuum/model"
-	"github.com/daveshanley/vacuum/utils"
+	"github.com/pb33f/libopenapi/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )