Merge pull request #5 from foomo/contentful-v0.5.1

wip: revert regex

collection.go

@@ -32,16 +32,16 @@ type Collection struct {
 	Includes    map[string]interface{} `json:"includes"`
 	NextSyncURL string                 `json:"nextSyncUrl"`
 	NextPageURL string                 `json:"nextPageUrl"`
-	SyncToken   string
+	SyncToken   string                 `json:"syncToken"`
 	// Errors which occur in the contentful structure. They are not checked in
 	// this source code. Please do it yourself as you might still want to parse
 	// the result despite the error.
 	Errors []Error `json:"errors"`
 	// Details might also get set in case of errors.
-	Details *ErrorDetails
+	Details *ErrorDetails `json:"details"`
 }
 
-var syncTokenRegex = regexp.MustCompile(`sync_token=([a-zA-Z0-9\\-_]+)`)
+var syncTokenRegex = regexp.MustCompile(`sync_token=([a-zA-Z0-9_\-]+)`)
 
 // NewCollection initializes a new collection
 func NewCollection(options *CollectionOptions) *Collection {

collection_test.go

@@ -7,8 +7,51 @@ import (
 	"os"
 	"reflect"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
+func TestSyncTokenRegex(t *testing.T) {
+	tests := []struct {
+		name  string
+		url   string
+		token string
+	}{
+		{
+			name:  "empty",
+			url:   "/spaces/yadj1kx9rmg0/sync?access_token=fdb4e7a3102747a02ea69ebac5e282b9e44d28fb340f778a4f5e788625a61abe",
+			token: "",
+		},
+		{
+			name:  "a-zA-Z0-9",
+			url:   "/spaces/yadj1kx9rmg0/sync?access_token=fdb4e7a3102747a02ea69ebac5e282b9e44d28fb340f778a4f5e788625a61abe&sync_token=w7Ese3kdwpMbMhhgw7QAUsKiw6bCi09CwpFYwpwywqVYw6DDh8OawrTDpWvCgMOhw6jCuAhxWX_CocOPwowhcsOzeEJSbcOvwrfDlCjDr8O1YzLDvi9FOTXCmsOqT8OFcHPDuFDCqyMMTsKNw7rDmsOqKcOnw7FCwpIfNMOcFMOxFnHCoCzDpAjCucOdwpwfw4YTK8Kpw6zCtDrChVQlNsO2ZybDnw",
+			token: "w7Ese3kdwpMbMhhgw7QAUsKiw6bCi09CwpFYwpwywqVYw6DDh8OawrTDpWvCgMOhw6jCuAhxWX_CocOPwowhcsOzeEJSbcOvwrfDlCjDr8O1YzLDvi9FOTXCmsOqT8OFcHPDuFDCqyMMTsKNw7rDmsOqKcOnw7FCwpIfNMOcFMOxFnHCoCzDpAjCucOdwpwfw4YTK8Kpw6zCtDrChVQlNsO2ZybDnw",
+		},
+		{
+			name:  "a-zA-Z0-9_",
+			url:   "/spaces/yadj1kx9rmg0/sync?access_token=fdb4e7a3102747a02ea69ebac5e282b9e44d28fb340f778a4f5e788625a61abe&sync_token=w_Ese3kdwpMbMhhgw7QAUsKiw6bCi09CwpFYwpwywqVYw6DDh8OawrTDpWvCgMOhw6jCuAhxWX_CocOPwowhcsOzeEJSbcOvwrfDlCjDr8O1YzLDvi9FOTXCmsOqT8OFcHPDuFDCqyMMTsKNw7rDmsOqKcOnw7FCwpIfNMOcFMOxFnHCoCzDpAjCucOdwpwfw4YTK8Kpw6zCtDrChVQlNsO2ZybDnw",
+			token: "w_Ese3kdwpMbMhhgw7QAUsKiw6bCi09CwpFYwpwywqVYw6DDh8OawrTDpWvCgMOhw6jCuAhxWX_CocOPwowhcsOzeEJSbcOvwrfDlCjDr8O1YzLDvi9FOTXCmsOqT8OFcHPDuFDCqyMMTsKNw7rDmsOqKcOnw7FCwpIfNMOcFMOxFnHCoCzDpAjCucOdwpwfw4YTK8Kpw6zCtDrChVQlNsO2ZybDnw",
+		},
+		{
+			name:  "a-zA-Z0-9_-",
+			url:   "/spaces/yadj1kx9rmg0/sync?access_token=fdb4e7a3102747a02ea69ebac5e282b9e44d28fb340f778a4f5e788625a61abe&sync_token=w_-se3kdwpMbMhhgw7QAUsKiw6bCi09CwpFYwpwywqVYw6DDh8OawrTDpWvCgMOhw6jCuAhxWX_CocOPwowhcsOzeEJSbcOvwrfDlCjDr8O1YzLDvi9FOTXCmsOqT8OFcHPDuFDCqyMMTsKNw7rDmsOqKcOnw7FCwpIfNMOcFMOxFnHCoCzDpAjCucOdwpwfw4YTK8Kpw6zCtDrChVQlNsO2ZybDnw",
+			token: "w_-se3kdwpMbMhhgw7QAUsKiw6bCi09CwpFYwpwywqVYw6DDh8OawrTDpWvCgMOhw6jCuAhxWX_CocOPwowhcsOzeEJSbcOvwrfDlCjDr8O1YzLDvi9FOTXCmsOqT8OFcHPDuFDCqyMMTsKNw7rDmsOqKcOnw7FCwpIfNMOcFMOxFnHCoCzDpAjCucOdwpwfw4YTK8Kpw6zCtDrChVQlNsO2ZybDnw",
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			matches := syncTokenRegex.FindStringSubmatch(test.url)
+			if test.token == "" {
+				assert.Empty(t, matches)
+			} else {
+				require.Len(t, matches, 2)
+				assert.Equal(t, test.token, matches[1])
+			}
+		})
+	}
+}
+
 func TestNewCollection(t *testing.T) {
 	setup()
 	defer teardown()

query_test.go

@@ -29,6 +29,14 @@ func TestQueryContentType(t *testing.T) {
 	assert.Equal(t, expected.Encode(), q.String())
 }
 
+func TestQueryInitial(t *testing.T) {
+	q := NewQuery().Initial("true")
+	expected := url.Values{}
+	expected.Set("initial", "true")
+	expected.Set("include", "0")
+	assert.Equal(t, expected.Encode(), q.String())
+}
+
 func TestQuerySelect(t *testing.T) {
 	q := NewQuery().
 		ContentType("ct").