Refactoring with throwing everything that sticking out badly. Tests, cleanups.

Author: smgladkovskiy

README.md

@@ -1,31 +1,18 @@
-errors
-------
+errors-go
+--------
 
-Пакет для работы с ошибками.
+Mini packet to work with errors
 
-## Полезные методы (common)
+## Methods
 
 ### New(string) error
 
-Создаёт новую ошибку с переданным текстом
+Creates new error with passed message.
 
-### HasErrors(interface{}) bool
-
-Проверяет, есть ли в переданном аргументе ошибки. Проверяет как на error тип, так и на различные 
-модификации, которые могут прийти: `map[string]error`, `[]error`, `gorm.Errors`, ...
-
-## Gin specific
-
-### Response(*gin.Context, interface{})
+### Newf(string) error
 
-Формирует `ResponseObject` для ответ ошибочным запросом. Обрабатывает различные виды ошибок 
-и отдаёт их соответствующим образом.
+Creates new error with message sprintf'ed by format with passed params.
 
-### MakeResponse(interface{}) (int, *ErrorObject)
-
-Формирует `ErrorObject` для предыдущего метода. Удобно пользоваться, когда ответ содержит как 
-`data`, так и `error`  
-
-### InitValidator()
+### HasErrors(interface{}) bool
 
-Биндит валидатор к gin'у
+Checks if error occurs in passed var.

errors.go

@@ -1,34 +1,25 @@
 package errors
 
 import (
-	"github.com/jinzhu/gorm"
-	"github.com/pkg/errors"
-)
-
-const (
-	NilErrorCode     = 0
-	UnknownErrorCode = -1
-	ek               = "common"
-)
+	"fmt"
 
-var (
-	NotFound             = errors.New("Route not found")
-	NoMethod             = errors.New("Method not allowed")
-	ServerError          = errors.New("Internal server error")
-	NoDataInRequestError = errors.New("No data in requests")
-	NoRowsAffected       = errors.New("No rows affected")
-	RecordNotFound       = errors.New("record not found")
+	"github.com/pkg/errors"
 )
 
+//New returns new error with passed message
 func New(msg string) error {
 	return errors.New(msg)
 }
 
+//Newf returns new error with message sprintf'ed by format with passed params
+func Newf(format string, params ...interface{}) error {
+	return New(fmt.Sprintf(format, params...))
+}
+
+//HasErrors checks if error occurs in passed err
 func HasErrors(err interface{}) bool {
 	hasErrors := false
 	switch e := err.(type) {
-	case gorm.Errors:
-		hasErrors = len(e) > 0
 	case []error:
 		hasErrors = len(e) > 0
 	case map[string]error:

errors_test.go

@@ -0,0 +1,55 @@
+package errors
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/jinzhu/gorm"
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+)
+
+type testCase struct {
+	input    interface{}
+	hasError bool
+}
+
+func TestHasErrors(t *testing.T) {
+	tcs := map[string]testCase{
+		"common error": {input: errors.New("some error"), hasError: true},
+		"errors slice": {input: []error{errors.New("some error"), errors.New("some more error")}, hasError: true},
+		"errors map":   {input: map[string]error{"some error": errors.New("some error"), "some more error": errors.New("some more error")}, hasError: true},
+		"gorm error":   {input: gorm.Errors{errors.New("some error"), errors.New("some more error")}, hasError: true},
+	}
+
+	for caseName, tc := range tcs {
+		if !assert.Equal(t, HasErrors(tc.input), tc.hasError, caseName) {
+			t.FailNow()
+		}
+	}
+}
+
+func TestNew(t *testing.T) {
+	errMsg := "err msg"
+	err := New(errMsg)
+	if !assert.Error(t, err) {
+		t.FailNow()
+	}
+	if !assert.Equal(t, errMsg, err.Error()) {
+		t.FailNow()
+	}
+}
+
+func TestNewf(t *testing.T) {
+	errFormat := "err msg: %s | %s"
+	errMsg1 := "alert 1!"
+	errMsg2 := "alert 2!"
+	err := Newf(errFormat, errMsg1, errMsg2)
+	if !assert.Error(t, err) {
+		t.FailNow()
+	}
+
+	if !assert.Equal(t, fmt.Sprintf(errFormat, errMsg1, errMsg2), err.Error()) {
+		t.FailNow()
+	}
+}

gin.go

@@ -3,27 +3,7 @@ module github.com/microparts/errors-go
 go 1.12
 
 require (
-	cloud.google.com/go v0.37.2 // indirect
-	github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853 // indirect
-	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
-	github.com/gin-gonic/gin v1.3.0
-	github.com/go-playground/locales v0.12.1 // indirect
-	github.com/go-playground/universal-translator v0.16.0 // indirect
-	github.com/go-sql-driver/mysql v1.4.1 // indirect
-	github.com/gofrs/uuid v3.2.0+incompatible // indirect
-	github.com/jinzhu/gorm v1.9.2
-	github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
-	github.com/jinzhu/now v1.0.0 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
-	github.com/leodido/go-urn v1.1.0 // indirect
-	github.com/lib/pq v1.0.0 // indirect
-	github.com/mattn/go-sqlite3 v1.10.0 // indirect
-	github.com/microparts/logs-go v0.2.2
+	github.com/jinzhu/gorm v1.9.8
 	github.com/pkg/errors v0.8.1
-	github.com/sirupsen/logrus v1.4.0
-	golang.org/x/net v0.0.0-20190327091125-710a502c58a2 // indirect
-	google.golang.org/appengine v1.5.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
-	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
-	gopkg.in/go-playground/validator.v9 v9.27.0
+	github.com/stretchr/testify v1.3.0
 )