Updated Set logic + added Interceptors (#34)

Author: Dean Karn

.github/workflows/workflow.yml

@@ -8,7 +8,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.14.x, 1.15.x]
+        go-version: [1.15.x, 1.16.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -32,7 +32,7 @@ jobs:
         run: go test -race -covermode=atomic -coverprofile="profile.cov" ./...
 
       - name: Send Coverage
-        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.15.x'
+        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.16.x'
         uses: shogo82148/actions-goveralls@v1
         with:
           path-to-profile: profile.cov
@@ -45,4 +45,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.32
+          version: v1.41.1

Makefile

@@ -1,9 +1,12 @@
 GOCMD=GO111MODULE=on go
 
+lint:
+	golangci-lint run
+
 test:
 	$(GOCMD) test -cover -race ./...
 
 bench:
 	$(GOCMD) test -bench=. -benchmem ./...
 
-.PHONY: linters-install lint test bench
+.PHONY: test bench lint

README.md

@@ -1,6 +1,6 @@
 Package mold
 ============
-![Project status](https://img.shields.io/badge/version-4.0.0-green.svg)
+![Project status](https://img.shields.io/badge/version-4.1.0-green.svg)
 [![Build Status](https://travis-ci.org/go-playground/mold.svg?branch=v2)](https://travis-ci.org/go-playground/mold)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/mold/badge.svg?branch=v2)](https://coveralls.io/github/go-playground/mold?branch=v2)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/mold)](https://goreportcard.com/report/github.com/go-playground/mold)

go.mod

@@ -6,4 +6,5 @@ require (
 	github.com/go-playground/assert/v2 v2.0.1
 	github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734
 	github.com/segmentio/go-snakecase v1.2.0
+	github.com/stretchr/testify v1.7.0
 )

go.sum

@@ -1,6 +1,17 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734 h1:Cpx2WLIv6fuPvaJAHNhYOgYzk/8RcJXu/8+mOrxf2KM=
 github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734/go.mod h1:hqVOMAwu+ekffC3Tvq5N1ljnXRrFKcaSjbCmQ8JgYaI=
 github.com/segmentio/go-snakecase v1.2.0 h1:4cTmEjPGi03WmyAHWBjX53viTpBkn/z+4DO++fqYvpw=
 github.com/segmentio/go-snakecase v1.2.0/go.mod h1:jk1miR5MS7Na32PZUykG89Arm+1BUSYhuGR6b7+hJto=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

modifiers/multi.go

@@ -2,12 +2,17 @@ package modifiers
 
 import (
 	"context"
+	"reflect"
 	"strconv"
 	"time"
 
 	"github.com/go-playground/mold/v4"
 )
 
+var (
+	durationType = reflect.TypeOf(time.Duration(0))
+)
+
 //
 // defaultValue allows setting of a default value IF no value is already present.
 //
@@ -16,44 +21,56 @@ func defaultValue(ctx context.Context, fl mold.FieldLevel) error {
 		return nil
 	}
 
-	switch fl.Field().Interface().(type) {
-	case string:
+	switch fl.Field().Kind() {
+	case reflect.String:
 		fl.Field().SetString(fl.Param())
 
-	case int, int8, int16, int32, int64:
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32:
 		value, err := strconv.Atoi(fl.Param())
 		if err != nil {
 			return err
 		}
 		fl.Field().SetInt(int64(value))
 
-	case uint, uint8, uint16, uint32, uint64:
+	case reflect.Int64:
+		var value int64
+
+		if fl.Field().Type() == durationType {
+			d, err := time.ParseDuration(fl.Param())
+			if err != nil {
+				return err
+			}
+			value = int64(d)
+		} else {
+			i, err := strconv.Atoi(fl.Param())
+			if err != nil {
+				return err
+			}
+			value = int64(i)
+		}
+		fl.Field().SetInt(value)
+
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
 		value, err := strconv.Atoi(fl.Param())
 		if err != nil {
 			return err
 		}
 		fl.Field().SetUint(uint64(value))
 
-	case float32, float64:
+	case reflect.Float32, reflect.Float64:
 		value, err := strconv.ParseFloat(fl.Param(), 64)
 		if err != nil {
 			return err
 		}
 		fl.Field().SetFloat(value)
 
-	case bool:
+	case reflect.Bool:
 		value, err := strconv.ParseBool(fl.Param())
 		if err != nil {
 			return err
 		}
 		fl.Field().SetBool(value)
 
-	case time.Duration:
-		d, err := time.ParseDuration(fl.Param())
-		if err != nil {
-			return err
-		}
-		fl.Field().SetInt(int64(d))
 	}
 	return nil
 }

modifiers/multi_test.go

@@ -9,6 +9,12 @@ import (
 )
 
 func TestDefault(t *testing.T) {
+
+	type State int
+	const FINISHED State = 5
+
+	var state State
+
 	conform := New()
 
 	tests := []struct {
@@ -18,6 +24,12 @@ func TestDefault(t *testing.T) {
 		expected    interface{}
 		expectError bool
 	}{
+		{
+			name:     "default State (although enum default value should be the default in practice)",
+			field:    state,
+			tags:     "default=5",
+			expected: FINISHED,
+		},
 		{
 			name:     "default string",
 			field:    "",