From b28beab7f35199f3b4401d5797c158eae935f1cf Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <abramowi@adobe.com>
Date: Wed, 17 Jan 2018 13:02:09 -0800
Subject: [PATCH 1/2] Add TestUnmarshalNestedStructPtr

---
 request_test.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/request_test.go b/request_test.go
index 7f58827..2016143 100644
--- a/request_test.go
+++ b/request_test.go
@@ -946,6 +946,52 @@ func sampleSerializedEmbeddedTestModel() *Blog {
 	return blog
 }
 
+func TestUnmarshalNestedStructPtr(t *testing.T) {
+	type Director struct {
+		Firstname string `json:"firstname"`
+		Surname   string `json:"surname"`
+	}
+	type Movie struct {
+		ID       string    `jsonapi:"primary,movies"`
+		Name     string    `jsonapi:"attr,name"`
+		Director *Director `jsonapi:"attr,director"`
+	}
+	sample := map[string]interface{}{
+		"data": map[string]interface{}{
+			"type": "movies",
+			"id":   "123",
+			"attributes": map[string]interface{}{
+				"name": "The Shawshank Redemption",
+				"director": map[string]interface{}{
+					"firstname": "Frank",
+					"surname":   "Darabont",
+				},
+			},
+		},
+	}
+
+	data, err := json.Marshal(sample)
+	if err != nil {
+		t.Fatal(err)
+	}
+	in := bytes.NewReader(data)
+	out := new(Movie)
+
+	if err := UnmarshalPayload(in, out); err != nil {
+		t.Fatal(err)
+	}
+
+	if out.Name != "The Shawshank Redemption" {
+		t.Fatalf("expected out.Name to be `The Shawshank Redemption`, but got `%s`", out.Name)
+	}
+	if out.Director.Firstname != "Frank" {
+		t.Fatalf("expected out.Director.Firstname to be `Frank`, but got `%s`", out.Director.Firstname)
+	}
+	if out.Director.Surname != "Darabont" {
+		t.Fatalf("expected out.Director.Surname to be `Darabont`, but got `%s`", out.Director.Surname)
+	}
+}
+
 func TestUnmarshalNestedStruct(t *testing.T) {
 
 	boss := map[string]interface{}{

From 16e19ab9f9b35a130eab32ed7a02b567709d737d Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <abramowi@adobe.com>
Date: Wed, 17 Jan 2018 11:40:21 -0800
Subject: [PATCH 2/2] Make nested struct pointers work

---
 request.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/request.go b/request.go
index 88bf2ba..da42c05 100644
--- a/request.go
+++ b/request.go
@@ -542,6 +542,10 @@ func handlePointer(attribute interface{}, args []string, fieldType reflect.Type,
 		concreteVal = reflect.ValueOf(&cVal)
 	case uintptr:
 		concreteVal = reflect.ValueOf(&cVal)
+	case map[string]interface{}:
+		var err error
+		concreteVal, err = handleStruct(attribute, args, fieldType, fieldValue)
+		return concreteVal.Elem(), err
 	default:
 		return reflect.Value{}, ErrUnsupportedPtrType
 	}