♻️: shorten constructor name

This commit is contained in:
Ruidy 2022-01-27 11:58:31 -04:00
parent 633d3be218
commit 218a2f4e79
5 changed files with 15 additions and 10 deletions

View file

@ -1,11 +1,16 @@
EXECPATH = ./build/dist
lint: lint:
golangci-lint run golangci-lint run
dev: dev:
air air
run: build:
go run main.go go build -o $(EXECPATH) .
run: build
$(EXECPATH) new
run-web: run-web:
go run main.go --web=t go run main.go --web=t
@ -16,4 +21,4 @@ web:
test: test:
go test -json -count=1 ./... -coverpkg=./... -coverprofile coverage.txt -covermode=atomic | gotestfmt && go tool cover -html coverage.txt && rm coverage.txt go test -json -count=1 ./... -coverpkg=./... -coverprofile coverage.txt -covermode=atomic | gotestfmt && go tool cover -html coverage.txt && rm coverage.txt
.PHONY: lint run dev run-web test .PHONY: lint run dev run-web test build

View file

@ -15,7 +15,7 @@ func (s Server) HandleNewPassword(w http.ResponseWriter, r *http.Request) {
log.Fatal(err) log.Fatal(err)
} }
opts := passgen.Options{Length: params.Length, WithNumbers: params.WithNumbers} opts := passgen.Options{Length: params.Length, WithNumbers: params.WithNumbers}
password := passgen.NewPasswordGenerator(opts.SetDefaults()).NewPassword() password := passgen.New(opts.SetDefaults()).NewPassword()
render.Status(r, http.StatusAccepted) render.Status(r, http.StatusAccepted)
err := render.Render(w, r, &PasswordResponse{Password: password}) err := render.Render(w, r, &PasswordResponse{Password: password})

View file

@ -21,7 +21,7 @@ var newPasswordCommand = &cobra.Command{Use: "new",
Long: "Create a secure password", Long: "Create a secure password",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
opts := passgen.Options{Length: Length, WithNumbers: WithNumbers} opts := passgen.Options{Length: Length, WithNumbers: WithNumbers}
pg := passgen.NewPasswordGenerator(opts.SetDefaults()) pg := passgen.New(opts.SetDefaults())
password := pg.NewPassword() password := pg.NewPassword()
display(password) display(password)
}} }}

View file

@ -11,8 +11,8 @@ type PasswordGenerator struct {
options *Options options *Options
} }
// NewPasswordGenerator returns a valid PasswordGenerator given the specified Options. // New returns a valid PasswordGenerator given the specified Options.
func NewPasswordGenerator(opts *Options) *PasswordGenerator { func New(opts *Options) *PasswordGenerator {
pg := &PasswordGenerator{} pg := &PasswordGenerator{}
pg.options = opts.SetDefaults() pg.options = opts.SetDefaults()
pg.characters = pg.shuffleCharacters(opts.WithNumbers) pg.characters = pg.shuffleCharacters(opts.WithNumbers)

View file

@ -12,7 +12,7 @@ func TestGeneratePasswordWithGivenCharacterNumber(t *testing.T) {
opts := &passgen.Options{ opts := &passgen.Options{
Length: rand.Intn(12), // nolint Length: rand.Intn(12), // nolint
} }
pg := passgen.NewPasswordGenerator(opts) pg := passgen.New(opts)
if password := pg.NewPassword(); len(password) != opts.Length { if password := pg.NewPassword(); len(password) != opts.Length {
t.Errorf("Expected a password to be %d characters long, got %d", opts.Length, len(password)) t.Errorf("Expected a password to be %d characters long, got %d", opts.Length, len(password))
@ -20,7 +20,7 @@ func TestGeneratePasswordWithGivenCharacterNumber(t *testing.T) {
} }
func TestGeneratePasswordWithDefaultCharacterNumber(t *testing.T) { func TestGeneratePasswordWithDefaultCharacterNumber(t *testing.T) {
pg := passgen.NewPasswordGenerator(&passgen.Options{}) pg := passgen.New(&passgen.Options{})
if password := pg.NewPassword(); len(password) != 6 { if password := pg.NewPassword(); len(password) != 6 {
t.Errorf("Expected a password to be %d characters long, got %d", 6, len(password)) t.Errorf("Expected a password to be %d characters long, got %d", 6, len(password))
@ -31,7 +31,7 @@ func TestGeneratePasswordWithLettersAndNumbers(t *testing.T) {
opts := &passgen.Options{ opts := &passgen.Options{
WithNumbers: true, WithNumbers: true,
} }
pg := passgen.NewPasswordGenerator(opts) pg := passgen.New(opts)
if password := pg.NewPassword(); !containNumbers(password) { if password := pg.NewPassword(); !containNumbers(password) {
t.Errorf("Expected password to contain NUMBERS, got %q", password) t.Errorf("Expected password to contain NUMBERS, got %q", password)