From 4e6b8011b67f7ee75e0cd8710295835b6a0c0abd Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 8 Jun 2019 18:10:49 -0500 Subject: [PATCH] Shorten constructor function names --- chunkreader.go | 8 +++++--- chunkreader_test.go | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/chunkreader.go b/chunkreader.go index 43363e42..b47747f2 100644 --- a/chunkreader.go +++ b/chunkreader.go @@ -20,8 +20,9 @@ type Config struct { MinBufLen int // Minimum buffer length } -func NewChunkReader(r io.Reader) *ChunkReader { - cr, err := NewChunkReaderEx(r, Config{}) +// New creates and returns a new ChunkReader for r with default configuration. +func New(r io.Reader) *ChunkReader { + cr, err := NewConfig(r, Config{}) if err != nil { panic("default config can't be bad") } @@ -29,7 +30,8 @@ func NewChunkReader(r io.Reader) *ChunkReader { return cr } -func NewChunkReaderEx(r io.Reader, config Config) (*ChunkReader, error) { +// NewConfig creates and a new ChunkReader for r configured by config. +func NewConfig(r io.Reader, config Config) (*ChunkReader, error) { if config.MinBufLen == 0 { config.MinBufLen = 4096 } diff --git a/chunkreader_test.go b/chunkreader_test.go index 66515e87..67a20af2 100644 --- a/chunkreader_test.go +++ b/chunkreader_test.go @@ -7,7 +7,7 @@ import ( func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) { server := &bytes.Buffer{} - r, err := NewChunkReaderEx(server, Config{MinBufLen: 4}) + r, err := NewConfig(server, Config{MinBufLen: 4}) if err != nil { t.Fatal(err) } @@ -44,7 +44,7 @@ func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) { func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) { server := &bytes.Buffer{} - r, err := NewChunkReaderEx(server, Config{MinBufLen: 4}) + r, err := NewConfig(server, Config{MinBufLen: 4}) if err != nil { t.Fatal(err) } @@ -66,7 +66,7 @@ func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) { func TestChunkReaderDoesNotReuseBuf(t *testing.T) { server := &bytes.Buffer{} - r, err := NewChunkReaderEx(server, Config{MinBufLen: 4}) + r, err := NewConfig(server, Config{MinBufLen: 4}) if err != nil { t.Fatal(err) }