feat: DefaultLocale and better version check

erm/templates/contentful_vo_base.gotmpl

@@ -64,10 +64,10 @@ type RichTextData struct {
 
 type RichTextGenericNode struct {
 	NodeType string                 `json:"nodeType"`
-	Content  []*RichTextGenericNode `json:"content"`
-	Data     map[string]interface{} `json:"data"`
+	Content  []*RichTextGenericNode `json:"content,omitempty"`
+	Data     map[string]interface{} `json:"data,omitempty"`
 	Value    string                 `json:"value"`
-	Marks    []RichTextMark         `json:"marks"`
+	Marks    []RichTextMark         `json:"marks,omitempty"`
 }
 
 type richTextHtmlTag struct {

erm/templates/contentful_vo_lib.gotmpl

@@ -131,7 +131,7 @@ const (
 var SpaceLocales = []Locale{ {{ range $index , $locale := $locales }}
 "{{$locale.Code}}",{{ end }}
 }
-{{ range $index , $locale := $locales }}{{ if $locale.Default }}const defaultLocale Locale = SpaceLocale{{ onlyLetters $locale.Name }}{{ end }}
+{{ range $index , $locale := $locales }}{{ if $locale.Default }}const DefaultLocale Locale = SpaceLocale{{ onlyLetters $locale.Name }}{{ end }}
 {{ end }}var localeFallback = map[Locale]Locale{ {{ range $index, $locale := $locales }}{{if $locale.FallbackCode}} SpaceLocale{{ onlyLetters $locale.Name }}: {{ range $indexSearch, $localeSearch := $locales }}{{ if eq $localeSearch.Code $locale.FallbackCode}}SpaceLocale{{ onlyLetters $localeSearch.Name }}{{ end }}{{ end }}, {{ else }}SpaceLocale{{ onlyLetters $locale.Name }}: "", {{ end }}{{ end }}}
 
 const (
@@ -422,7 +422,7 @@ func NewAssetFromURL(id string, uploadUrl string, imageFileType string, title st
 			return nil
 		}
 	} else {
-		loc = defaultLocale
+		loc = DefaultLocale
 	}
 	asset := &contentful.Asset{
 		Sys: &contentful.Sys{

erm/templates/contentful_vo_lib_contenttype.gotmpl

@@ -144,7 +144,7 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) {{ firstCap $field.ID }}(locale
     }
 	vo.Fields.RWLock{{ firstCap $field.ID }}.RLock()
 	defer vo.Fields.RWLock{{ firstCap $field.ID }}.RUnlock()
-	loc := defaultLocale
+	loc := DefaultLocale
 	if len(locale) != 0 {
 		loc = locale[0]
 		if _, ok := localeFallback[loc]; !ok {
@@ -182,7 +182,7 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) {{ firstCap $field.ID }}(locale
     }
 	vo.Fields.RWLock{{ firstCap $field.ID }}.RLock()
 	defer vo.Fields.RWLock{{ firstCap $field.ID }}.RUnlock()
-	loc := defaultLocale
+	loc := DefaultLocale
 	if len(locale) != 0 {
 		loc = locale[0]
 		if _, ok := localeFallback[loc]; !ok {
@@ -222,7 +222,7 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) {{ firstCap $field.ID }}(locale
 	vo.Fields.RWLock{{ firstCap $field.ID }}.RLock()
 	defer vo.Fields.RWLock{{ firstCap $field.ID }}.RUnlock()
 	{{ $field.ID }} := []*EntryReference{}
-	loc := defaultLocale
+	loc := DefaultLocale
 	if len(locale) != 0 {
 		loc = locale[0]
 		if _, ok := localeFallback[loc]; !ok {
@@ -282,7 +282,7 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) {{ firstCap $field.ID }}(locale
     }
 	vo.Fields.RWLock{{ firstCap $field.ID }}.RLock()
 	defer vo.Fields.RWLock{{ firstCap $field.ID }}.RUnlock()
-	loc := defaultLocale
+	loc := DefaultLocale
 	if len(locale) != 0 {
 		loc = locale[0]
 		if _, ok := localeFallback[loc]; !ok {
@@ -342,8 +342,8 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) {{ firstCap $field.ID }}(locale
 	vo.Fields.RWLock{{ firstCap $field.ID }}.RLock()
 	defer vo.Fields.RWLock{{ firstCap $field.ID }}.RUnlock()
 	{{ $field.ID }} := []*contentful.AssetNoLocale{}
-	loc := defaultLocale
-	reqLoc := defaultLocale
+	loc := DefaultLocale
+	reqLoc := DefaultLocale
 	if len(locale) != 0 {
 		loc = locale[0]
 		reqLoc = locale[0]
@@ -410,8 +410,8 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) {{ firstCap $field.ID }}(locale
     }
 	vo.Fields.RWLock{{ firstCap $field.ID }}.RLock()
 	defer vo.Fields.RWLock{{ firstCap $field.ID }}.RUnlock()
-	loc := defaultLocale
-	reqLoc := defaultLocale
+	loc := DefaultLocale
+	reqLoc := DefaultLocale
 	if len(locale) != 0 {
 		loc = locale[0]
 		reqLoc = locale[0]
@@ -474,7 +474,7 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) Set{{ firstCap $field.ID }}({{ $
 	if vo == nil {
 		return errors.New("Set{{ firstCap $field.ID }}({{ $field.ID }}: Value Object is nil")
 	}
-	loc := defaultLocale
+	loc := DefaultLocale
 	if len(locale) != 0 {
 		loc = locale[0]
 		if _, ok := localeFallback[loc]; !ok {

main.go

@@ -14,7 +14,7 @@ import (
 	"github.com/foomo/gocontentful/erm"
 )
 
-var VERSION = "v1.0.22"
+var VERSION = "v1.0.23"
 
 type contentfulRc struct {
 	ManagementToken string `json:"managementToken"`
@@ -86,7 +86,7 @@ func main() {
 		if err != nil {
 			fatal(err)
 		}
-		if conf.RequireVersion != "" && conf.RequireVersion != VERSION {
+		if conf.RequireVersion != "" && conf.RequireVersion != VERSION && conf.RequireVersion != strings.Trim(VERSION, "v") {
 			fatal("Required version mismatch. Want: " + conf.RequireVersion + "  Have: " + VERSION)
 		}
 	} else {