make fields exportable

Author: PaulisMatrix

redis_store.go

@@ -7,8 +7,8 @@ import (
 )
 
 type RedigoStore struct {
-	pool   *redis.Pool
-	script *redis.Script
+	Pool   *redis.Pool
+	Script *redis.Script
 }
 
 func newRedisPool(address string) *redis.Pool {
@@ -27,32 +27,32 @@ func NewRedigoStore(pool *redis.Pool) RedigoStore {
 	conn := pool.Get()
 	defer conn.Close()
 
-	var script = redis.NewScript(1, tokenBucketScript)
+	var script = redis.NewScript(1, TokenBucketScript)
 	err := script.Load(conn)
 	if err != nil {
 		panic(err)
 	}
-	return RedigoStore{pool: pool, script: script}
+	return RedigoStore{Pool: pool, Script: script}
 }
 
 func NewRedigoSWStore(pool *redis.Pool) RedigoStore {
 	// we will initialise with the script
 	conn := pool.Get()
 	defer conn.Close()
 
-	var script = redis.NewScript(1, slidingWindowScript)
+	var script = redis.NewScript(1, SlidingWindowScript)
 	err := script.Load(conn)
 	if err != nil {
 		panic(err)
 	}
-	return RedigoStore{pool: pool, script: script}
+	return RedigoStore{Pool: pool, Script: script}
 }
 
 func (s *RedigoStore) inc(key string, rate, windowSize, now int) (map[string]int, error) {
-	conn := s.pool.Get()
+	conn := s.Pool.Get()
 	defer conn.Close()
 
-	r, err := redis.IntMap(s.script.Do(conn, key, rate, windowSize, now))
+	r, err := redis.IntMap(s.Script.Do(conn, key, rate, windowSize, now))
 	if err != nil {
 		return nil, err
 	}

sliding_window.go

@@ -6,10 +6,10 @@ import (
 )
 
 type SlidingWindow struct {
-	identifier string
-	rate       int
-	windowSize int
-	store      Store
+	Identifier string
+	Rate       int
+	WindowSize int
+	Store      Store
 }
 
 // The sliding window algorithm
@@ -33,16 +33,16 @@ func (sw *SlidingWindow) Allow(key string) (bool, error) {
 }
 
 func (sw *SlidingWindow) AllowWithStatus(key string) (Status, error) {
-	userKey := fmt.Sprintf("%s:%s", sw.identifier, key)
-	res, err := sw.store.Inc(userKey, sw.rate, sw.windowSize, int(TimeMillis(timeNow())))
+	userKey := fmt.Sprintf("%s:%s", sw.Identifier, key)
+	res, err := sw.Store.Inc(userKey, sw.Rate, sw.WindowSize, int(TimeMillis(timeNow())))
 	if err != nil {
 		return Status{}, err
 	}
 	timeElapsed := timeNow().Sub(res.LastRefill)
 	s := Status{
 		Allowed:     res.Allowed,
-		Remaining:   sw.rate - res.Counter,
-		NextRefresh: timeElapsed + (time.Duration(sw.windowSize) * time.Millisecond),
+		Remaining:   sw.Rate - res.Counter,
+		NextRefresh: timeElapsed + (time.Duration(sw.WindowSize) * time.Millisecond),
 	}
 	return s, nil
 }

sliding_window_test.go

@@ -12,10 +12,10 @@ func TestWindow_AllowWithStatus(t *testing.T) {
 	key := "test"
 
 	sw := &SlidingWindow{
-		identifier: "marketing_campaigns",
-		rate:       rate,
-		windowSize: 1000,
-		store:      &store,
+		Identifier: "marketing_campaigns",
+		Rate:       rate,
+		WindowSize: 1000,
+		Store:      &store,
 	}
 	// nextRefresh := time.Duration(b.windowSize) * time.Millisecond
 	for i := 1; i <= rate; i++ {

token_bucket.go

@@ -8,10 +8,10 @@ import (
 var timeNow = time.Now
 
 type Bucket struct {
-	identifier string
-	rate       int
-	windowSize int
-	store      Store
+	Identifier string
+	Rate       int
+	WindowSize int
+	Store      Store
 }
 
 type Status struct {
@@ -47,16 +47,16 @@ func (b *Bucket) Allow(key string) (bool, error) {
 }
 
 func (b *Bucket) AllowWithStatus(key string) (Status, error) {
-	userKey := fmt.Sprintf("%s:%s", b.identifier, key)
-	res, err := b.store.Inc(userKey, b.rate, b.windowSize, int(TimeMillis(timeNow())))
+	userKey := fmt.Sprintf("%s:%s", b.Identifier, key)
+	res, err := b.Store.Inc(userKey, b.Rate, b.WindowSize, int(TimeMillis(timeNow())))
 	if err != nil {
 		return Status{}, err
 	}
 	timeElapsed := timeNow().Sub(res.LastRefill)
 	s := Status{
 		Allowed:     res.Allowed,
-		Remaining:   b.rate - res.Counter,
-		NextRefresh: timeElapsed + (time.Duration(b.windowSize) * time.Millisecond),
+		Remaining:   b.Rate - res.Counter,
+		NextRefresh: timeElapsed + (time.Duration(b.WindowSize) * time.Millisecond),
 	}
 	return s, nil
 }

token_bucket_script.go

@@ -1,6 +1,6 @@
 package ratelimit
 
-var tokenBucketScript = `
+var TokenBucketScript = `
 local key = KEYS[1]
 local rate = tonumber(ARGV[1])
 local window = tonumber(ARGV[2])
@@ -64,7 +64,7 @@ end
 return run()
 `
 
-var slidingWindowScript = `
+var SlidingWindowScript = `
 local key = KEYS[1]
 local rate = tonumber(ARGV[1])
 local window = tonumber(ARGV[2])

token_bucket_test.go

@@ -17,10 +17,10 @@ func TestBucket_AllowWithStatus(t *testing.T) {
 	}
 
 	b := &Bucket{
-		identifier: "marketing_campaigns",
-		rate:       rate,
-		windowSize: 1000,
-		store:      &store,
+		Identifier: "marketing_campaigns",
+		Rate:       rate,
+		WindowSize: 1000,
+		Store:      &store,
 	}
 	// nextRefresh := time.Duration(b.windowSize) * time.Millisecond
 	for i := 1; i <= rate; i++ {