simplifying conversions and workflow

Author: semihbkgr

.github/dependabot.yaml

@@ -8,4 +8,3 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-

.github/workflows/ci.yml .github/workflows/ci.yaml.github/workflows/ci.yml renamed to .github/workflows/ci.yaml

@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - '**'
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
 
 jobs:
   test:
@@ -20,9 +25,11 @@ jobs:
           go-version: 1.18
       - name: Build
         run: go build -v ./...
+      - name: Fmt
+        run: test -z $(gofmt -l .)
+      - name: Vet
+        run: go vet ./...
       - name: Test
         run: go test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
       - name: Codecov
         uses: codecov/codecov-action@v3
-      - name: Vet
-        run: go vet ./...

.github/workflows/lint.yaml

@@ -1,15 +1,15 @@
-[![Go Reference](https://pkg.go.dev/badge/github.com/semihbkgr/go-rsmq.svg)](https://pkg.go.dev/github.com/semihbkgr/go-rsmq)
-![ci workflow](https://github.com/semihbkgr/go-rsmq/actions/workflows/ci.yml/badge.svg)
-[![codecov](https://codecov.io/gh/SemihBKGR/go-rsmq/branch/master/graph/badge.svg?token=IVOQ6PLNHM)](https://codecov.io/gh/SemihBKGR/go-rsmq)
-
 # go-rsmq
 
+[![CI workflow](https://github.com/semihbkgr/go-rsmq/actions/workflows/ci.yaml/badge.svg)](https://github.com/semihbkgr/go-rsmq/actions/workflows/ci.yaml)
+[![Codecov](https://codecov.io/gh/SemihBKGR/go-rsmq/branch/master/graph/badge.svg?token=IVOQ6PLNHM)](https://codecov.io/gh/SemihBKGR/go-rsmq)
+[![Go Reference](https://pkg.go.dev/badge/github.com/semihbkgr/go-rsmq.svg)](https://pkg.go.dev/github.com/semihbkgr/go-rsmq)
+
 A lightweight message queue for Go that requires no dedicated queue server. Just a Redis server.
 
 Go implementation of https://github.com/smrchy/rsmq.
 
 ```shell
-go get github.com/semihbkgr/go-rsmq
+$ go get github.com/semihbkgr/go-rsmq
 ```
 
 ## Redis Simple Message Queue
@@ -50,10 +50,10 @@ if msg == nil {
 
 ```
 
-[Producer/Consumer example](./example_test.go)
+[Producer/Consumer example](./example/example.go)
 
 ## Implementation Notes
 
-All details about the queue are [here](https://github.com/smrchy/rsmq/blob/master/README.md).
+All details about the queue implementation are in [here](https://github.com/smrchy/rsmq/blob/master/README.md).
 
-It follows all naming conventions of javascript implementation.
+go-rsmq follows all the naming conventions of javascript implementation.

README.md

@@ -1,51 +1,32 @@
 package rsmq
 
 import (
-	"fmt"
 	"math/rand"
 	"strconv"
 	"strings"
 )
 
-func convertToSigned[n int | int64](a any) n {
-	switch v := a.(type) {
-	case int:
-		return n(v)
-	case int64:
-		return n(v)
-	case string:
-		r, err := strconv.ParseInt(v, 10, 0)
-		if err != nil {
-			panic(err)
-		}
-		return n(r)
-	default:
-		panic(fmt.Errorf("type: %T, incompatible type to convert to signed", a))
+func convertStringToInt[n int | int64](s any) n {
+	r, err := strconv.ParseInt(s.(string), 10, 0)
+	if err != nil {
+		panic(err)
 	}
+	return n(r)
 }
 
-func convertToUnsigned[n uint | uint64](a any) n {
-	switch v := a.(type) {
-	case uint:
-		return n(v)
-	case uint64:
-		return n(v)
-	case int:
-		return n(v)
-	case int64:
-		return n(v)
-	case string:
-		r, err := strconv.ParseUint(v, 10, 0)
-		if err != nil {
-			panic(err)
-		}
-		return n(r)
-	default:
-		panic(fmt.Errorf("type: %T, incompatible type to convert to unsigned", a))
+func convertStringToUint[n uint | uint64](s any) n {
+	r, err := strconv.ParseUint(s.(string), 10, 0)
+	if err != nil {
+		panic(err)
 	}
+	return n(r)
 }
 
-func convertStringToUnsigned[n uint | uint64](s any, def n) n {
+func convertIntToUint(s any) uint64 {
+	return uint64(s.(int64))
+}
+
+func convertStringToUnsignedOrDefault[n uint | uint64](s any, def n) n {
 	if s == nil {
 		return def
 	}
@@ -59,9 +40,6 @@ func convertStringToUnsigned[n uint | uint64](s any, def n) n {
 const idLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 
 func makeID(n int) string {
-	if n <= 0 {
-		return ""
-	}
 	sb := strings.Builder{}
 	ln := len(idLetters)
 	for i := 0; i < n; i++ {

convert.go

@@ -1,15 +1,15 @@
-package rsmq_test
+package example
 
 import (
 	"fmt"
-	"github.com/go-redis/redis"
-	"github.com/semihbkgr/go-rsmq"
 	"strconv"
 	"time"
-)
 
-func Example_producer_consumer() {
+	"github.com/go-redis/redis"
+	"github.com/semihbkgr/go-rsmq"
+)
 
+func exampleProducerConsumer() {
 	ns := "example"
 	qname := "queue"
 
@@ -46,5 +46,4 @@ func Example_producer_consumer() {
 			}
 		}
 	}
-
 }

example_test.go example/example.goexample_test.go renamed to example/example.go

@@ -172,9 +172,9 @@ func (rsmq *RedisSMQ) getQueue(qname string, uid bool) (*queueDef, error) {
 		return nil, ErrQueueNotFound
 	}
 
-	vt := convertToUnsigned[uint](hmGetValues[0])
-	delay := convertToUnsigned[uint](hmGetValues[1])
-	maxsize := convertToSigned[int](hmGetValues[2])
+	vt := convertStringToUint[uint](hmGetValues[0])
+	delay := convertStringToUint[uint](hmGetValues[1])
+	maxsize := convertStringToInt[int](hmGetValues[2])
 
 	t := timeCmd.Val()
 
@@ -221,13 +221,13 @@ func (rsmq *RedisSMQ) GetQueueAttributes(qname string) (*QueueAttributes, error)
 
 	hmGetValues := hmGetSliceCmd.Val()
 
-	vt := convertToUnsigned[uint](hmGetValues[0])
-	delay := convertToUnsigned[uint](hmGetValues[1])
-	maxsize := convertToSigned[int](hmGetValues[2])
-	totalRecv := convertStringToUnsigned[uint64](hmGetValues[3], 0)
-	totalSent := convertStringToUnsigned[uint64](hmGetValues[4], 0)
-	created := convertToUnsigned[uint64](hmGetValues[5])
-	modified := convertToUnsigned[uint64](hmGetValues[6])
+	vt := convertStringToUint[uint](hmGetValues[0])
+	delay := convertStringToUint[uint](hmGetValues[1])
+	maxsize := convertStringToInt[int](hmGetValues[2])
+	totalRecv := convertStringToUnsignedOrDefault[uint64](hmGetValues[3], 0)
+	totalSent := convertStringToUnsignedOrDefault[uint64](hmGetValues[4], 0)
+	created := convertStringToUint[uint64](hmGetValues[5])
+	modified := convertStringToUint[uint64](hmGetValues[6])
 
 	msgs := uint64(zCardIntCmd.Val())
 	hiddenMsgs := uint64(zCountIntCmd.Val())
@@ -420,8 +420,8 @@ func (rsmq *RedisSMQ) createQueueMessage(cmd *redis.Cmd) (*QueueMessage, error)
 	}
 	id := vals[0].(string)
 	message := vals[1].(string)
-	rc := convertToUnsigned[uint64](vals[2])
-	fr := convertToSigned[int64](vals[3])
+	rc := convertIntToUint(vals[2])
+	fr := convertStringToInt[int64](vals[3])
 	sent, err := strconv.ParseInt(id[0:10], 36, 64)
 	if err != nil {
 		panic(err)

rsmq.go

@@ -76,7 +76,6 @@ return o`
 // KEYS[1]: the zset key
 // KEYS[2]: the message id
 //
-//
 // * Find the message id
 // * Set the new timer
 //