Skip to content

Commit bae106c

Browse files
committed
Refactoring for golint warnings
1 parent 0b389c4 commit bae106c

File tree

9 files changed

+23
-32
lines changed

9 files changed

+23
-32
lines changed

.golangci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ linters:
2424
- depguard
2525
- errorlint
2626
- goconst
27-
- gocritic
27+
- gocritic
28+
- golint

.travis.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Usage
1616
-----------
1717
An example of a simple template text generation:
1818
```go
19-
tg := text_generator.New()
19+
tg := textgenerator.New()
2020
template := "Good {morning|day}!"
2121

2222
fmt.Print(tg.Generate(template))
@@ -28,7 +28,7 @@ fmt.Print(tg.Generate(template))
2828

2929
An example of a complex generation template text:
3030
```go
31-
tg := text_generator.New()
31+
tg := textgenerator.New()
3232
template := "{Good {morning|evening|day}|Goodnight|Hello}, {friend|brother}! {How are you|What's new with you}?"
3333

3434
fmt.Print(tg.Generate(template))

cached-text-generator.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Package text_generator Fast text generator on a mask.
2-
package text_generator
1+
package textgenerator
32

43
import (
54
"crypto/md5"
@@ -8,13 +7,14 @@ import (
87
"time"
98
)
109

10+
// CachedTextGenerator Implementing caching to prevent re-generation of phrases
1111
type CachedTextGenerator struct {
12-
generator TextGeneratorInterface
12+
generator GeneratorInterface
1313
cache *cache.Cache
1414
}
1515

1616
// NewCached returns a new instance a cached text generator.
17-
func NewCached(generator TextGeneratorInterface, ttl int) TextGeneratorInterface {
17+
func NewCached(generator GeneratorInterface, ttl int) GeneratorInterface {
1818
return &CachedTextGenerator{
1919
generator: generator,
2020
cache: cache.New(time.Duration(ttl)*time.Second, 30*time.Second),
@@ -36,7 +36,8 @@ func (t *CachedTextGenerator) Generate(text string) string {
3636
return result
3737
}
3838

39-
func (t *CachedTextGenerator) Configure(startTag rune, endTag rune, separator rune) TextGeneratorInterface {
39+
// Configure Configuring tags and separators
40+
func (t *CachedTextGenerator) Configure(startTag rune, endTag rune, separator rune) GeneratorInterface {
4041
t.generator.Configure(startTag, endTag, separator)
4142
return t
4243
}

cached-text-generator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package text_generator
1+
package textgenerator
22

33
import (
44
"github.com/stretchr/testify/assert"

example_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
package text_generator_test
1+
package textgenerator
22

33
import (
44
"fmt"
5-
"github.com/liderman/text-generator"
65
)
76

87
func ExampleSimpleTemplate() {
9-
tg := text_generator.New()
8+
tg := New()
109
template := "Good {morning|day}!"
1110

1211
fmt.Print(tg.Generate(template))
1312
}
1413

1514
func ExampleComplexTemplate() {
16-
tg := text_generator.New()
15+
tg := New()
1716
template := "{Good {morning|evening|day}|Goodnight|Hello}, {friend|brother}! {How are you|What's new with you}?"
1817

1918
fmt.Print(tg.Generate(template))

text-generator.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
// Package text_generator Fast text generator on a mask.
2-
package text_generator
1+
package textgenerator
32

43
import (
54
"math/rand"
65
"time"
76
)
87

9-
type TextGeneratorInterface interface {
8+
// GeneratorInterface Text generator interface for expanding functionality
9+
type GeneratorInterface interface {
1010
Generate(text string) string
11-
Configure(startTag rune, endTag rune, separator rune) TextGeneratorInterface
11+
Configure(startTag rune, endTag rune, separator rune) GeneratorInterface
1212
}
1313

14+
// TextGenerator Generator of unique texts by mask
1415
type TextGenerator struct {
1516
startTag rune
1617
endTag rune
1718
separator rune
1819
}
1920

2021
// New returns a new instance a text generator.
21-
func New() TextGeneratorInterface {
22+
func New() GeneratorInterface {
2223
rand.Seed(time.Now().UnixNano())
2324
return &TextGenerator{
2425
startTag: '{',
@@ -28,7 +29,7 @@ func New() TextGeneratorInterface {
2829
}
2930

3031
// Configure method configures the parser
31-
func (t *TextGenerator) Configure(startTag rune, endTag rune, separator rune) TextGeneratorInterface {
32+
func (t *TextGenerator) Configure(startTag rune, endTag rune, separator rune) GeneratorInterface {
3233
t.startTag = startTag
3334
t.endTag = endTag
3435
t.separator = separator

text-generator_bench_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package text_generator
1+
package textgenerator
22

33
import (
44
"testing"

text-generator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package text_generator
1+
package textgenerator
22

33
import (
44
"github.com/stretchr/testify/assert"

0 commit comments

Comments
 (0)