add NewFromReader()

Author: philhofer

simplejson_go10.go

@@ -5,6 +5,7 @@ package simplejson
 import (
 	"encoding/json"
 	"errors"
+	"io"
 )
 
 // Implements the json.Unmarshaler interface.
@@ -20,6 +21,14 @@ func (j *Json) Float64() (float64, error) {
 	return -1, errors.New("type assertion to float64 failed")
 }
 
+// NewFromReader returns a *Json by decoding from an io.Reader
+func NewFromReader(r io.Reader) (*Json, error) {
+	j := new(Json)
+	dec := json.NewDecoder(r)
+	err := dec.Decode(&j.data)
+	return j, err
+}
+
 // Int type asserts to `float64` then converts to `int`
 func (j *Json) Int() (int, error) {
 	if f, ok := (j.data).(float64); ok {

simplejson_go10_test.go

@@ -3,14 +3,54 @@
 package simplejson
 
 import (
+	"bytes"
 	"github.com/bmizerany/assert"
 	"strconv"
 	"testing"
 )
 
+func TestNewFromReader(t *testing.T) {
+	buf := bytes.NewBuffer([]byte(`{
+		"test": {
+			"array": [1, "2", 3],
+			"arraywithsubs": [
+				{"subkeyone": 1},
+				{"subkeytwo": 2, "subkeythree": 3}
+			],
+			"bignum": 8000000000
+		}
+	}`))
+	js, err := NewFromReader(buf)
+
+	//Standard Test Case
+	assert.NotEqual(t, nil, js)
+	assert.Equal(t, nil, err)
+
+	arr, _ := js.Get("test").Get("array").Array()
+	assert.NotEqual(t, nil, arr)
+	for i, v := range arr {
+		var iv int
+		switch v.(type) {
+		case float64:
+			iv = int(v.(float64))
+		case string:
+			iv, _ = strconv.Atoi(v.(string))
+		}
+		assert.Equal(t, i+1, iv)
+	}
+
+	ma := js.Get("test").Get("array").MustArray()
+	assert.Equal(t, ma, []interface{}{float64(1), "2", float64(3)})
+
+	mm := js.Get("test").Get("arraywithsubs").GetIndex(0).MustMap()
+	assert.Equal(t, mm, map[string]interface{}{"subkeyone": float64(1)})
+
+	assert.Equal(t, js.Get("test").Get("bignum").MustInt64(), int64(8000000000))
+}
+
 func TestSimplejsonGo10(t *testing.T) {
-	js, err := NewJson([]byte(`{ 
-		"test": { 
+	js, err := NewJson([]byte(`{
+		"test": {
 			"array": [1, "2", 3],
 			"arraywithsubs": [
 				{"subkeyone": 1},

simplejson_go11.go

@@ -6,6 +6,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"io"
 	"strconv"
 )
 
@@ -16,6 +17,15 @@ func (j *Json) UnmarshalJSON(p []byte) error {
 	return dec.Decode(&j.data)
 }
 
+// NewFromReader returns a *Json by decoding from an io.Reader
+func NewFromReader(r io.Reader) (*Json, error) {
+	j := new(Json)
+	dec := json.NewDecoder(r)
+	dec.UseNumber()
+	err := dec.Decode(&j.data)
+	return j, err
+}
+
 // Float64 type asserts to `json.Number` then converts to `float64`
 func (j *Json) Float64() (float64, error) {
 	if n, ok := (j.data).(json.Number); ok {

simplejson_go11_test.go

@@ -3,15 +3,60 @@
 package simplejson
 
 import (
+	"bytes"
 	"encoding/json"
 	"github.com/bmizerany/assert"
 	"strconv"
 	"testing"
 )
 
+func TestNewFromReader(t *testing.T) {
+	//Use New Constructor
+	buf := bytes.NewBuffer([]byte(`{
+		"test": {
+			"array": [1, "2", 3],
+			"arraywithsubs": [
+				{"subkeyone": 1},
+				{"subkeytwo": 2, "subkeythree": 3}
+			],
+			"bignum": 9223372036854775807,
+			"uint64": 18446744073709551615
+		}
+	}`))
+	js, err := NewFromReader(buf)
+
+	//Standard Test Case
+	assert.NotEqual(t, nil, js)
+	assert.Equal(t, nil, err)
+
+	arr, _ := js.Get("test").Get("array").Array()
+	assert.NotEqual(t, nil, arr)
+	for i, v := range arr {
+		var iv int
+		switch v.(type) {
+		case json.Number:
+			i64, err := v.(json.Number).Int64()
+			assert.Equal(t, nil, err)
+			iv = int(i64)
+		case string:
+			iv, _ = strconv.Atoi(v.(string))
+		}
+		assert.Equal(t, i+1, iv)
+	}
+
+	ma := js.Get("test").Get("array").MustArray()
+	assert.Equal(t, ma, []interface{}{json.Number("1"), "2", json.Number("3")})
+
+	mm := js.Get("test").Get("arraywithsubs").GetIndex(0).MustMap()
+	assert.Equal(t, mm, map[string]interface{}{"subkeyone": json.Number("1")})
+
+	assert.Equal(t, js.Get("test").Get("bignum").MustInt64(), int64(9223372036854775807))
+	assert.Equal(t, js.Get("test").Get("uint64").MustUint64(), uint64(18446744073709551615))
+}
+
 func TestSimplejsonGo11(t *testing.T) {
-	js, err := NewJson([]byte(`{ 
-		"test": { 
+	js, err := NewJson([]byte(`{
+		"test": {
 			"array": [1, "2", 3],
 			"arraywithsubs": [
 				{"subkeyone": 1},