Inner map can be pointer to map

simplejson.go

@@ -3,6 +3,7 @@ package simplejson
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"log"
 )
 
@@ -33,6 +34,13 @@ func New() *Json {
 	}
 }
 
+// NewFromMap returns a pointer to a new `Json` object initialized by `data`
+func NewFromMap(data map[string]interface{}) *Json {
+	return &Json{
+		data: data,
+	}
+}
+
 // Interface returns the underlying data
 func (j *Json) Interface() interface{} {
 	return j.data
@@ -176,7 +184,13 @@ func (j *Json) Map() (map[string]interface{}, error) {
 	if m, ok := (j.data).(map[string]interface{}); ok {
 		return m, nil
 	}
-	return nil, errors.New("type assertion to map[string]interface{} failed")
+	if m, ok := (j.data).(*map[string]interface{}); ok {
+		return *m, nil
+	}
+	if m, ok := (j.data).(*Json); ok {
+		return m.MustMap(), nil
+	}
+	return nil, errors.New(fmt.Sprintf("type assertion to map[string]interface{} failed %T", j.data))
 }
 
 // Array type asserts to an `array`

simplejson_go10.go

@@ -45,7 +45,7 @@ func (j *Json) Int() (int, error) {
 	case uint, uint8, uint16, uint32, uint64:
 		return int(reflect.ValueOf(j.data).Uint()), nil
 	}
-	return 0, errors.New("invalid value type")
+	return 0, errors.New("invalid value type %T", j.data)
 }
 
 // Int64 coerces into an int64
@@ -58,7 +58,7 @@ func (j *Json) Int64() (int64, error) {
 	case uint, uint8, uint16, uint32, uint64:
 		return int64(reflect.ValueOf(j.data).Uint()), nil
 	}
-	return 0, errors.New("invalid value type")
+	return 0, errors.New("invalid value type %T", j.data)
 }
 
 // Uint64 coerces into an uint64

simplejson_go10_test.go

@@ -4,9 +4,10 @@ package simplejson
 
 import (
 	"bytes"
-	"github.com/bmizerany/assert"
 	"strconv"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewFromReader(t *testing.T) {

simplejson_go11_test.go

@@ -5,9 +5,10 @@ package simplejson
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/bmizerany/assert"
 	"strconv"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewFromReader(t *testing.T) {

simplejson_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/bmizerany/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSimplejson(t *testing.T) {
@@ -246,3 +246,10 @@ func TestPathWillOverwriteExisting(t *testing.T) {
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "bar", s)
 }
+
+func TestInnerMapCanBePointer(t *testing.T) {
+	inner := map[string]interface{}{"key": "value"}
+	data := map[string]interface{}{"key": &inner}
+	js := NewFromMap(data)
+	assert.Equal(t, "value", js.Get("key").Get("key").MustString())
+}