feat(nav): implement schemes reader (#92)

Taskfile.yml

@@ -206,12 +206,6 @@ tasks:
     cmds:
       - goveralls -repotoken {{.COVERALLS_TOKEN}}
 
-  # === go generate ==========================================
-
-  co-gen-cfg:
-    cmds:
-      - go generate src/app/proxy
-
   # === i18n =================================================
 
   clear:

src/app/command/bootstrap.go

@@ -67,6 +67,7 @@ type Bootstrap struct {
 	Container   *assistant.CobraContainer
 	OptionsInfo ConfigureOptionsInfo
 	ProfilesCFG proxy.ProfilesConfig
+	SchemesCFG  proxy.SchemesConfig
 	SamplerCFG  proxy.SamplerConfig
 	Vfs         storage.VirtualFS
 }
@@ -98,6 +99,7 @@ func (b *Bootstrap) Root(options ...ConfigureOptionFn) *cobra.Command {
 			Viper:      &configuration.GlobalViperConfig{},
 			Readers: ConfigReaders{
 				Profiles: &MsProfilesConfigReader{},
+				Schemes:  &MsSchemesConfigReader{},
 				Sampler:  &MsSamplerConfigReader{},
 			},
 		},
@@ -148,7 +150,7 @@ func (b *Bootstrap) Root(options ...ConfigureOptionFn) *cobra.Command {
 				}
 
 				if scheme := inputs.ProfileFam.Native.Scheme; scheme != "" {
-					if err := b.SamplerCFG.Validate(scheme, b.ProfilesCFG); err != nil {
+					if err := b.SchemesCFG.Validate(scheme, b.ProfilesCFG); err != nil {
 						return err
 					}
 				}
@@ -233,5 +235,6 @@ func (b *Bootstrap) viper() {
 	// TODO: handle the read errors
 	//
 	b.ProfilesCFG, _ = b.OptionsInfo.Config.Readers.Profiles.Read(b.OptionsInfo.Config.Viper)
+	b.SchemesCFG, _ = b.OptionsInfo.Config.Readers.Schemes.Read(b.OptionsInfo.Config.Viper)
 	b.SamplerCFG, _ = b.OptionsInfo.Config.Readers.Sampler.Read(b.OptionsInfo.Config.Viper)
 }

src/app/command/config-readers.go

@@ -39,6 +39,18 @@ func (r *MsProfilesConfigReader) Read(viper configuration.ViperConfig) (proxy.Pr
 	return profilesCFG, nil
 }
 
+type MsSchemesConfigReader struct{}
+
+func (r *MsSchemesConfigReader) Read(viper configuration.ViperConfig) (proxy.SchemesConfig, error) {
+	var (
+		schemesCFG proxy.MsSchemesConfig
+	)
+
+	err := viper.UnmarshalKey("schemes", &schemesCFG)
+
+	return schemesCFG, err
+}
+
 type MsSamplerConfigReader struct{}
 
 func (r *MsSamplerConfigReader) Read(viper configuration.ViperConfig) (proxy.SamplerConfig, error) {
@@ -53,5 +65,6 @@ func (r *MsSamplerConfigReader) Read(viper configuration.ViperConfig) (proxy.Sam
 
 type ConfigReaders struct {
 	Profiles proxy.ProfilesConfigReader
+	Schemes  proxy.SchemesConfigReader
 	Sampler  proxy.SamplerConfigReader
 }

src/app/command/shrink-cmd.go

@@ -137,6 +137,7 @@ func (b *Bootstrap) buildShrinkCommand(container *assistant.CobraContainer) *cob
 						b.OptionsInfo.Program,
 						b.OptionsInfo.Config.Viper,
 						b.ProfilesCFG,
+						b.SchemesCFG,
 						b.SamplerCFG,
 						b.Vfs,
 					)

src/app/command/shrink-cmd_test.go

@@ -6,9 +6,12 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
+	"github.com/snivilised/cobrass/src/assistant/configuration"
+	cmocks "github.com/snivilised/cobrass/src/assistant/mocks"
 	"github.com/snivilised/pixa/src/app/command"
+	"github.com/snivilised/pixa/src/app/mocks"
 	"github.com/snivilised/pixa/src/internal/helpers"
+	"go.uber.org/mock/gomock"
 
 	"github.com/snivilised/extendio/xfs/storage"
 )
@@ -32,7 +35,9 @@ type shrinkTE struct {
 	directory string
 }
 
-func expectValidShrinkCmdInvocation(vfs storage.VirtualFS, entry *shrinkTE, root string) {
+func expectValidShrinkCmdInvocation(vfs storage.VirtualFS, entry *shrinkTE, root string,
+	config configuration.ViperConfig,
+) {
 	bootstrap := command.Bootstrap{
 		Vfs: vfs,
 	}
@@ -52,6 +57,17 @@ func expectValidShrinkCmdInvocation(vfs storage.VirtualFS, entry *shrinkTE, root
 		args = append(args, entry.trashFlag, trash)
 	}
 
+	var (
+		ctrl               = gomock.NewController(GinkgoT())
+		mockViperConfig    = cmocks.NewMockViperConfig(ctrl)
+		mockProfilesReader = mocks.NewMockProfilesConfigReader(ctrl)
+		mockSchemesReader  = mocks.NewMockSchemesConfigReader(ctrl)
+		mockSamplerReader  = mocks.NewMockSamplerConfigReader(ctrl)
+	)
+
+	helpers.DoMockReadInConfig(mockViperConfig)
+	helpers.DoMockConfigs(config, mockProfilesReader, mockSchemesReader, mockSamplerReader)
+
 	tester := helpers.CommandTester{
 		Args: append(args, entry.args...),
 		Root: bootstrap.Root(func(co *command.ConfigureOptionsInfo) {
@@ -61,6 +77,13 @@ func expectValidShrinkCmdInvocation(vfs storage.VirtualFS, entry *shrinkTE, root
 			}
 			co.Config.Name = helpers.PixaConfigTestFilename
 			co.Config.ConfigPath = entry.configPath
+
+			co.Viper = &configuration.GlobalViperConfig{}
+			co.Config.Readers = command.ConfigReaders{
+				Profiles: mockProfilesReader,
+				Schemes:  mockSchemesReader,
+				Sampler:  mockSamplerReader,
+			}
 		}),
 	}
 
@@ -77,6 +100,7 @@ var _ = Describe("ShrinkCmd", Ordered, func() {
 		configPath string
 		root       string
 		vfs        storage.VirtualFS
+		config     configuration.ViperConfig
 	)
 
 	BeforeAll(func() {
@@ -86,7 +110,7 @@ var _ = Describe("ShrinkCmd", Ordered, func() {
 	})
 
 	BeforeEach(func() {
-		vfs, root, _ = helpers.SetupTest(
+		vfs, root, config = helpers.SetupTest(
 			"nasa-scientist-index.xml", configPath, l10nPath, helpers.Silent,
 		)
 	})
@@ -95,7 +119,7 @@ var _ = Describe("ShrinkCmd", Ordered, func() {
 		func(entry *shrinkTE) {
 			entry.directory = BackyardWorldsPlanet9Scan01
 			entry.configPath = configPath
-			expectValidShrinkCmdInvocation(vfs, entry, root)
+			expectValidShrinkCmdInvocation(vfs, entry, root, config)
 		},
 		func(entry *shrinkTE) string {
 			return fmt.Sprintf("🧪 ===> given: '%v'", entry.message)
@@ -232,7 +256,7 @@ var _ = Describe("ShrinkCmd", Ordered, func() {
 				},
 			}
 
-			expectValidShrinkCmdInvocation(vfs, entry, root)
+			expectValidShrinkCmdInvocation(vfs, entry, root, config)
 		})
 
 		It("🧪 should: execute successfully", func() {
@@ -247,7 +271,7 @@ var _ = Describe("ShrinkCmd", Ordered, func() {
 				},
 			}
 
-			expectValidShrinkCmdInvocation(vfs, entry, root)
+			expectValidShrinkCmdInvocation(vfs, entry, root, config)
 		})
 	})
 
@@ -264,7 +288,7 @@ var _ = Describe("ShrinkCmd", Ordered, func() {
 				},
 			}
 
-			expectValidShrinkCmdInvocation(vfs, entry, root)
+			expectValidShrinkCmdInvocation(vfs, entry, root, config)
 		})
 
 		It("🧪 should: execute successfully", func() {
@@ -279,7 +303,7 @@ var _ = Describe("ShrinkCmd", Ordered, func() {
 				},
 			}
 
-			expectValidShrinkCmdInvocation(vfs, entry, root)
+			expectValidShrinkCmdInvocation(vfs, entry, root, config)
 		})
 	})
 })

src/app/proxy/config-defaults.go

@@ -12,6 +12,7 @@ const (
 var (
 	DefaultProfilesConfig *MsProfilesConfig
 	DefaultSamplerConfig  *MsSamplerConfig
+	DefaultSchemesConfig  *MsSchemesConfig
 )
 
 func init() {
@@ -40,19 +41,20 @@ func init() {
 		},
 	}
 
+	DefaultSchemesConfig = &MsSchemesConfig{
+		"blur-sf": MsSchemeConfig{
+			Profiles: []string{"blur", "sf"},
+		},
+		"adaptive-sf": MsSchemeConfig{
+			Profiles: []string{"adaptive", "sf"},
+		},
+		"adaptive-blur": MsSchemeConfig{
+			Profiles: []string{"adaptive", "blur"},
+		},
+	}
+
 	DefaultSamplerConfig = &MsSamplerConfig{
 		Files:   defaultNoFiles,
 		Folders: defaultNoFolders,
-		Schemes: MsSamplerSchemesConfig{
-			"blur-sf": MsSchemeConfig{
-				Profiles: []string{"blur", "sf"},
-			},
-			"adaptive-sf": MsSchemeConfig{
-				Profiles: []string{"adaptive", "sf"},
-			},
-			"adaptive-blur": MsSchemeConfig{
-				Profiles: []string{"adaptive", "blur"},
-			},
-		},
 	}
 }