detect array unmarshal into struct

also fixed example descriptions and added a new test for example

Author: wwwdata

examples/crud_example.go

@@ -5,7 +5,7 @@ To play with this example server you can run some of the following curl requests
 In order to demonstrate dynamic baseurl handling for requests, apply the --header="REQUEST_URI:https://www.your.domain.example.com" parameter to any of the commands.
 
 Create a new user:
-	curl -X POST http://localhost:31415/v0/users -d '{"data" : [{"type" : "users" , "attributes": {"user-name" : "marvin"}}]}'
+	curl -X POST http://localhost:31415/v0/users -d '{"data" : {"type" : "users" , "attributes": {"user-name" : "marvin"}}}'
 
 List users:
 	curl -X GET http://localhost:31415/v0/users
@@ -22,10 +22,10 @@ Delete:
 	curl -vX DELETE http://localhost:31415/v0/users/2
 
 Create a chocolate with the name sweet
-	curl -X POST http://localhost:31415/v0/chocolates -d '{"data" : [{"type" : "chocolates" , "attributes": {"name" : "Ritter Sport", "taste": "Very Good"}}]}'
+	curl -X POST http://localhost:31415/v0/chocolates -d '{"data" : {"type" : "chocolates" , "attributes": {"name" : "Ritter Sport", "taste": "Very Good"}}}'
 
 Create a user with a sweet
-	curl -X POST http://localhost:31415/v0/users -d '{"data" : [{"type" : "users" , "attributes": {"user-name" : "marvin"}, "relationships": {"sweets": {"data": [{"type": "chocolates", "id": "1"}]}}}]}'
+	curl -X POST http://localhost:31415/v0/users -d '{"data" : {"type" : "users" , "attributes": {"user-name" : "marvin"}, "relationships": {"sweets": {"data": [{"type": "chocolates", "id": "1"}]}}}}'
 
 List a users sweets
 	curl -X GET http://localhost:31415/v0/users/1/sweets

examples/crud_example_test.go

@@ -426,6 +426,32 @@ var _ = Describe("CrudExample", func() {
 			`))
 		})
 
+		It("Directly loading the sweets", func() {
+			req, err := http.NewRequest("GET", "/v0/users/1/sweets", nil)
+			Expect(err).ToNot(HaveOccurred())
+			api.Handler().ServeHTTP(rec, req)
+			Expect(rec.Code).To(Equal(http.StatusOK))
+			Expect(rec.Body.String()).To(MatchJSON(`
+			{
+				"meta": {
+					"author": "The api2go examples crew",
+					"license": "wtfpl",
+					"license-url": "http://www.wtfpl.net"
+				},
+				"data": [
+				{
+					"type": "chocolates",
+					"id": "1",
+					"attributes": {
+						"name": "Ritter Sport",
+						"taste": "Very Good"
+					}
+				}
+				]
+			}
+			`))
+		})
+
 		It("The relationship route works too", func() {
 			req, err := http.NewRequest("GET", "/v0/users/1/relationships/sweets", nil)
 			Expect(err).ToNot(HaveOccurred())

examples/model/model_user.go

@@ -66,6 +66,7 @@ func (u User) GetReferencedStructs() []jsonapi.MarshalIdentifier {
 func (u *User) SetToManyReferenceIDs(name string, IDs []string) error {
 	if name == "sweets" {
 		u.ChocolatesIDs = IDs
+		return nil
 	}
 
 	return errors.New("There is no to-many relationship with the name " + name)
@@ -75,6 +76,7 @@ func (u *User) SetToManyReferenceIDs(name string, IDs []string) error {
 func (u *User) AddToManyIDs(name string, IDs []string) error {
 	if name == "sweets" {
 		u.ChocolatesIDs = append(u.ChocolatesIDs, IDs...)
+		return nil
 	}
 
 	return errors.New("There is no to-many relationship with the name " + name)

jsonapi/unmarshal.go

@@ -103,7 +103,11 @@ func Unmarshal(data []byte, target interface{}) error {
 	}
 
 	if ctx.Data.DataArray != nil {
-		targetType := reflect.TypeOf(target).Elem().Elem()
+		targetSlice := reflect.TypeOf(target).Elem()
+		if targetSlice.Kind() != reflect.Slice {
+			return fmt.Errorf("Cannot unmarshal array to struct target %s", targetSlice)
+		}
+		targetType := targetSlice.Elem()
 		targetPointer := reflect.ValueOf(target)
 		targetValue := targetPointer.Elem()
 

jsonapi/unmarshal_test.go

@@ -203,6 +203,23 @@ var _ = Describe("Unmarshal", func() {
 			Expect(err.Error()).To(Equal("target must be a ptr"))
 		})
 
+		It("errors if json array cannot be unmarshaled into a struct", func() {
+			json := []byte(`
+			{
+				"data": [{
+					"type": "simplePosts",
+					"attributes": {
+						"title": "something"
+					}
+				}]
+			}
+			`)
+			var post SimplePost
+			err := Unmarshal(json, &post)
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(Equal("Cannot unmarshal array to struct target jsonapi.SimplePost"))
+		})
+
 		Context("slice fields", func() {
 			It("unmarshal slice fields with single entry correctly", func() {
 				sliceJSON := []byte(`