From 7bd55036138ddc0e5549650eadd6cfb6f8cbc0cd Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Mon, 10 Mar 2025 14:52:50 -0500
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Export=20Config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.go          | 20 ++++++++++++++++++++
 config_test.go     | 22 ++++++++++++++++++++++
 generators.go      |  2 +-
 generators_test.go |  2 +-
 options.go         | 29 +++++++----------------------
 options_test.go    | 19 +++++--------------
 6 files changed, 56 insertions(+), 38 deletions(-)
 create mode 100644 config.go
 create mode 100644 config_test.go

diff --git a/config.go b/config.go
new file mode 100644
index 0000000..dc6af3d
--- /dev/null
+++ b/config.go
@@ -0,0 +1,20 @@
+package nomino
+
+type Config struct {
+	original  string
+	prefix    string
+	suffix    string
+	extension string
+	generator Generator
+}
+
+func NewConfig(options ...Option) Config {
+	conf := Config{
+		extension: ".txt",
+		generator: uuidGen,
+	}
+	for _, opt := range options {
+		opt(&conf)
+	}
+	return conf
+}
diff --git a/config_test.go b/config_test.go
new file mode 100644
index 0000000..bb88b53
--- /dev/null
+++ b/config_test.go
@@ -0,0 +1,22 @@
+package nomino
+
+import (
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewConf(t *testing.T) {
+	c := NewConfig()
+	assert.Equal(t, ".txt", c.extension)
+	st, _ := c.generator()
+	_, parseErr := uuid.Parse(st)
+	assert.NoError(t, parseErr)
+}
+
+func TestNewConfWithOpts(t *testing.T) {
+	c := NewConfig(WithoutExtension(), WithPrefix("foobar"))
+	assert.Equal(t, "", c.extension)
+	assert.Equal(t, "foobar_", c.prefix)
+}
diff --git a/generators.go b/generators.go
index c409988..fdbdabd 100644
--- a/generators.go
+++ b/generators.go
@@ -14,7 +14,7 @@ type Generator func() (string, error)
 
 // WithGenerator sets the specified generator
 func WithGenerator(g Generator) Option {
-	return func(c *config) {
+	return func(c *Config) {
 		c.generator = g
 	}
 }
diff --git a/generators_test.go b/generators_test.go
index 210181f..7282656 100644
--- a/generators_test.go
+++ b/generators_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestWithGenerator(t *testing.T) {
 	g := func() (string, error) { return "abc", nil }
-	var c config
+	var c Config
 	WithGenerator(g)(&c)
 	st, err := c.generator()
 	assert.NoError(t, err)
diff --git a/options.go b/options.go
index 7f93d57..fa6c81c 100644
--- a/options.go
+++ b/options.go
@@ -2,56 +2,41 @@ package nomino
 
 import "strings"
 
-type config struct {
-	original  string
-	prefix    string
-	suffix    string
-	extension string
-	generator Generator
-}
-
-func defaultConf() config {
-	return config{
-		extension: ".txt",
-		generator: uuidGen,
-	}
-}
-
-// Option is an option for nomino
-type Option func(c *config)
+// Option sets configuration parameters for Config.
+type Option func(c *Config)
 
 // WithOriginal sets the original filename.
 // This will be included in the generated name after the generated string and before the suffix.
 func WithOriginal(o string) Option {
-	return func(c *config) {
+	return func(c *Config) {
 		c.original = "_" + o
 	}
 }
 
 // WithPrefix sets a prefix for the generated name.
 func WithPrefix(p string) Option {
-	return func(c *config) {
+	return func(c *Config) {
 		c.prefix = p + "_"
 	}
 }
 
 // WithSuffix sets a suffix for the generated name. It will be included in the base name before the suffix.
 func WithSuffix(s string) Option {
-	return func(c *config) {
+	return func(c *Config) {
 		c.suffix = "_" + s
 	}
 }
 
 // WithoutExtension sets no extension for the generated filename. By default, it will be txt
 func WithoutExtension() Option {
-	return func(c *config) {
+	return func(c *Config) {
 		c.extension = ""
 	}
 }
 
 // WithExtension sets the extension for the generated filename.
 func WithExtension(ext string) Option {
-	return func(c *config) {
+	return func(c *Config) {
 		c.extension = "." + strings.TrimPrefix(ext, ".")
 	}
 }
diff --git a/options_test.go b/options_test.go
index ea9ed47..12a2bb5 100644
--- a/options_test.go
+++ b/options_test.go
@@ -3,47 +3,38 @@ package nomino
 import (
 	"testing"
 
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestDefaultConf(t *testing.T) {
-	c := defaultConf()
-	assert.Equal(t, ".txt", c.extension)
-	st, _ := c.generator()
-	_, parseErr := uuid.Parse(st)
-	assert.NoError(t, parseErr)
-}
-
 func TestWithOriginal(t *testing.T) {
-	var c config
+	var c Config
 	name := "foobar"
 	WithOriginal(name)(&c)
 	assert.Equal(t, "_"+name, c.original)
 }
 
 func TestWithPrefix(t *testing.T) {
-	var c config
+	var c Config
 	pref := "draft"
 	WithPrefix(pref)(&c)
 	assert.Equal(t, pref+"_", c.prefix)
 }
 
 func TestWithSuffix(t *testing.T) {
-	var c config
+	var c Config
 	suff := "out"
 	WithSuffix(suff)(&c)
 	assert.Equal(t, "_"+suff, c.suffix)
 }
 
 func TestWithoutExtension(t *testing.T) {
-	c := config{extension: ".foobar"}
+	c := Config{extension: ".foobar"}
 	WithoutExtension()(&c)
 	assert.Equal(t, "", c.extension)
 }
 
 func TestWithExtension(t *testing.T) {
-	var c config
+	var c Config
 	ext := "yaml"
 	WithExtension(ext)(&c)
 	assert.Equal(t, "."+ext, c.extension)