bring schema package in and denormalize

Author: Fs02

add_error.go

@@ -1,6 +1,6 @@
 package changeset
 
-// Error defines information about grimoire's error.
+// Error struct.
 type Error struct {
 Message string `json:"message"`
 Field string `json:"field,omitempty"`

apply_string_test.go

@@ -4,7 +4,7 @@ import (
 "strings"
 "testing"
 
-"github.com/Fs02/form/params"
+"github.com/Fs02/changeset/params"
 "github.com/stretchr/testify/assert"
 )
 

cast.go

@@ -5,8 +5,7 @@ import (
 "reflect"
 "strings"
 
-"github.com/Fs02/form/params"
-"github.com/Fs02/grimoire/schema"
+"github.com/Fs02/changeset/params"
 )
 
 // CastErrorMessage is the default error message for Cast.
@@ -62,9 +61,9 @@ func Cast(data interface{}, params params.Params, fields []string, opts ...Optio
 
 func mapSchema(data interface{}, zero bool) (map[string]interface{}, map[string]reflect.Type, bool) {
 var (
-fields = schema.InferFields(data)
-types = schema.InferTypes(data)
-values = schema.InferValues(data)
+fields = inferFields(data)
+types = inferTypes(data)
+values = inferValues(data)
 valuesMap = make(map[string]interface{}, len(fields))
 typesMap = make(map[string]reflect.Type, len(fields))
 )

cast_assoc.go

@@ -5,7 +5,7 @@ import (
 "strconv"
 "strings"
 
-"github.com/Fs02/form/params"
+"github.com/Fs02/changeset/params"
 )
 
 // CastAssocErrorMessage is the default error message for CastAssoc when its invalid.

cast_assoc_test.go

@@ -4,7 +4,7 @@ import (
 "reflect"
 "testing"
 
-"github.com/Fs02/form/params"
+"github.com/Fs02/changeset/params"
 "github.com/stretchr/testify/assert"
 )
 

cast_test.go

@@ -5,7 +5,7 @@ import (
 "reflect"
 "testing"
 
-"github.com/Fs02/form/params"
+"github.com/Fs02/changeset/params"
 "github.com/stretchr/testify/assert"
 )
 

changeset.go

@@ -4,7 +4,7 @@ package changeset
 import (
 "reflect"
 
-"github.com/Fs02/form/params"
+"github.com/Fs02/changeset/params"
 )
 
 // Changeset used to cast and validate data before saving it to the database.

escape_string_test.go

@@ -3,7 +3,7 @@ package changeset
 import (
 "testing"
 
-"github.com/Fs02/form/params"
+"github.com/Fs02/changeset/params"
 "github.com/stretchr/testify/assert"
 )
 

go.mod

@@ -1,10 +1,10 @@
-module github.com/Fs02/form
+module github.com/Fs02/changeset
 
 go 1.13
 
 require (
-github.com/Fs02/grimoire v1.4.3
 github.com/Fs02/rel v0.4.0
+github.com/azer/snakecase v0.0.0-20161028114325-c818dddafb5c
 github.com/stretchr/testify v1.5.1
 github.com/tidwall/gjson v1.6.0
 )

go.sum

@@ -1,7 +1,4 @@
-github.com/Fs02/go-paranoid v0.0.0-20180516074805-ab50069def7d/go.mod h1:mUYWV9DG75bJ33LZlW1Je3MW64017zkfUFCf+QnCJs0=
 github.com/Fs02/go-paranoid v0.0.0-20190122110906-018c1ac5124a/go.mod h1:mUYWV9DG75bJ33LZlW1Je3MW64017zkfUFCf+QnCJs0=
-github.com/Fs02/grimoire v1.4.3 h1:ZZUtx0r1HmwonQtLNDBPZlO6az1n6DP3hBS++qoKr0g=
-github.com/Fs02/grimoire v1.4.3/go.mod h1:hjryvs3ViaQZ9BFU7xLUOtQS01WXCVyY7loi4q19u1o=
 github.com/Fs02/rel v0.4.0 h1:iop6aPDb2gfTIxYIbFq1sTEMJzSjlryb+mfFkSqgeig=
 github.com/Fs02/rel v0.4.0/go.mod h1:MeJHkZO46QVfjagPSnYX/noguNDOqNK2LLGse77asxw=
 github.com/azer/snakecase v0.0.0-20161028114325-c818dddafb5c h1:7zL0ljVI6ads5EFvx+Oq+uompnFBMJqtbuHvyobbJ1Q=
@@ -13,31 +10,30 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a h1:eeaG9XMUvRBYXJi4pg1ZKM7nxc5AfXfojeLLW7O5J3k=
 github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-sqlite3 v1.6.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/tidwall/gjson v1.1.3/go.mod h1:c/nTNbUr0E0OrXEhq1pwa8iEgc2DOt4ZZqAt1HtCkPA=
 github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
 github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
-github.com/tidwall/match v1.0.0/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=