Updates (#8)

* add default modifier tag
* fix linting issues
* add unhappy path tests

Author: Dean Karn

.github/workflows/workflow.yml

@@ -0,0 +1,48 @@
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+name: Test
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.14.x, 1.15.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-v1-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-v1-go-
+
+      - name: Test
+        run: go test -race -covermode=atomic -coverprofile="profile.cov" ./...
+
+      - name: Send Coverage
+        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.15.x'
+        uses: shogo82148/actions-goveralls@v1
+        with:
+          path-to-profile: profile.cov
+
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.32

.travis.yml

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

Makefile

@@ -1,6 +1,6 @@
 Package mold
 ============
-![Project status](https://img.shields.io/badge/version-3.0.1-green.svg)
+![Project status](https://img.shields.io/badge/version-3.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)

README.md

@@ -16,10 +16,6 @@ const (
 	typeEndKeys
 )
 
-const (
-	keysTagNotDefined = "'" + endKeysTag + "' tag encountered without a corresponding '" + keysTag + "' tag"
-)
-
 type structCache struct {
 	lock sync.Mutex
 	m    atomic.Value // map[reflect.Type]*cStruct
@@ -131,7 +127,7 @@ func (t *Transformer) extractStructCache(current reflect.Value) (*cStruct, error
 		} else {
 			// even if field doesn't have validations need cTag for traversing to potential inner/nested
 			// elements of the field.
-			ctag = new(cTag)
+			ctag = &cTag{typeof: typeDefault}
 		}
 
 		cs.fields = append(cs.fields, &cField{

cache.go

@@ -1,6 +1,6 @@
 module github.com/go-playground/mold/v3
 
-go 1.13
+go 1.15
 
 require (
 	github.com/go-playground/assert/v2 v2.0.1

go.mod

@@ -16,5 +16,6 @@ func New() *mold.Transformer {
 	mod.Register("lcase", ToLower)
 	mod.Register("ucase", ToUpper)
 	mod.Register("snake", SnakeCase)
+	mod.Register("default", Default)
 	return mod
 }

modifiers/modifiers.go

@@ -0,0 +1,59 @@
+package modifiers
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"strconv"
+	"time"
+
+	"github.com/go-playground/mold/v3"
+)
+
+//
+// Default allows setting of a default value IF no value is already present.
+//
+func Default(ctx context.Context, t *mold.Transformer, v reflect.Value, param string) error {
+	if !v.IsZero() {
+		return nil
+	}
+
+	fmt.Println(param, v.Type())
+
+	switch v.Interface().(type) {
+	case string:
+		v.SetString(param)
+	case int, int8, int16, int32, int64:
+		value, err := strconv.Atoi(param)
+		if err != nil {
+			return err
+		}
+		v.SetInt(int64(value))
+
+	case uint, uint8, uint16, uint32, uint64:
+		value, err := strconv.Atoi(param)
+		if err != nil {
+			return err
+		}
+		v.SetUint(uint64(value))
+	case float32, float64:
+		value, err := strconv.ParseFloat(param, 64)
+		if err != nil {
+			return err
+		}
+		v.SetFloat(value)
+	case bool:
+		value, err := strconv.ParseBool(param)
+		if err != nil {
+			return err
+		}
+		v.SetBool(value)
+	case time.Duration:
+		d, err := time.ParseDuration(param)
+		if err != nil {
+			return err
+		}
+		v.SetInt(int64(d))
+	}
+	return nil
+}

modifiers/multi.go

@@ -0,0 +1,102 @@
+package modifiers
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	. "github.com/go-playground/assert/v2"
+)
+
+func TestDefault(t *testing.T) {
+	conform := New()
+
+	tests := []struct {
+		name        string
+		field       interface{}
+		tags        string
+		expected    interface{}
+		expectError bool
+	}{
+		{
+			name:     "default string",
+			field:    "",
+			tags:     "default=test",
+			expected: "test",
+		},
+		{
+			name:     "default int",
+			field:    0,
+			tags:     "default=3",
+			expected: 3,
+		},
+		{
+			name:     "default uint",
+			field:    uint(0),
+			tags:     "default=4",
+			expected: uint(4),
+		},
+		{
+			name:     "default float",
+			field:    float32(0),
+			tags:     "default=5",
+			expected: float32(5),
+		},
+		{
+			name:     "default bool",
+			field:    false,
+			tags:     "default=true",
+			expected: true,
+		},
+		{
+			name:     "default time.Duration",
+			field:    time.Duration(0),
+			tags:     "default=1s",
+			expected: time.Duration(1_000_000_000),
+		},
+		{
+			name:        "bad default time.Duration",
+			field:       time.Duration(0),
+			tags:        "default=rex",
+			expectError: true,
+		},
+		{
+			name:        "bad default int",
+			field:       0,
+			tags:        "default=abc",
+			expectError: true,
+		},
+		{
+			name:        "bad default uint",
+			field:       uint(0),
+			tags:        "default=abc",
+			expectError: true,
+		},
+		{
+			name:        "bad default float",
+			field:       float32(0),
+			tags:        "default=abc",
+			expectError: true,
+		},
+		{
+			name:        "bad default bool",
+			field:       false,
+			tags:        "default=blue",
+			expectError: true,
+		},
+	}
+
+	for _, tc := range tests {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			err := conform.Field(context.Background(), &tc.field, tc.tags)
+			if tc.expectError {
+				NotEqual(t, err, nil)
+				return
+			}
+			Equal(t, err, nil)
+			Equal(t, tc.field, tc.expected)
+		})
+	}
+}

modifiers/multi_test.go

@@ -242,9 +242,6 @@ func (t *Transformer) setByField(ctx context.Context, orig reflect.Value, ct *cT
 		if typ == timeType {
 			return
 		}
-		if ct != nil {
-			ct = ct.next
-		}
 
 		if !current.CanAddr() {
 			newVal := reflect.New(typ).Elem()

mold.go

@@ -27,9 +27,8 @@ func TestBadValues(t *testing.T) {
 	tform.Register("blah", func(ctx context.Context, t *Transformer, value reflect.Value, param string) error { return nil })
 
 	type Test struct {
-		unexposed string
-		Ignore    string `mold:"-"`
-		String    string `mold:"blah,,blah"`
+		Ignore string `mold:"-"`
+		String string `mold:"blah,,blah"`
 	}
 
 	var tt Test

mold_test.go

@@ -8,6 +8,6 @@ import (
 
 func hashString(input string) string {
 	h := sha1.New()
-	io.WriteString(h, input)
+	_, _ = io.WriteString(h, input)
 	return fmt.Sprintf("%x", h.Sum(nil))
 }