From ca93b98cc9fdc43e5ede9603e01f4ee0c46a0a6b Mon Sep 17 00:00:00 2001
From: Hanzei <Hanzei@users.noreply.github.com>
Date: Mon, 29 Jan 2018 12:10:02 +0100
Subject: [PATCH] Convert floats to int when parsing JSON (#59)

---
 map.go      | 44 +++++++++++++++++++++++++++++++++++++++++---
 map_test.go | 24 ++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/map.go b/map.go
index 992c4b8..95149c0 100644
--- a/map.go
+++ b/map.go
@@ -97,12 +97,50 @@ func MustFromJSON(jsonString string) Map {
 //
 // Returns an error if the JSON is invalid.
 func FromJSON(jsonString string) (Map, error) {
-	var data Map
-	err := json.Unmarshal([]byte(jsonString), &data)
+	var m Map
+	err := json.Unmarshal([]byte(jsonString), &m)
 	if err != nil {
 		return Nil, err
 	}
-	return data, nil
+	m.tryConvertFloat64()
+	return m, nil
+}
+
+func (m Map) tryConvertFloat64() {
+	for k, v := range m {
+		switch v.(type) {
+		case float64:
+			f := v.(float64)
+			if float64(int(f)) == f {
+				m[k] = int(f)
+			}
+		case map[string]interface{}:
+			t := New(v)
+			t.tryConvertFloat64()
+			m[k] = t
+		case []interface{}:
+			m[k] = tryConvertFloat64InSlice(v.([]interface{}))
+		}
+	}
+}
+
+func tryConvertFloat64InSlice(s []interface{}) []interface{} {
+	for k, v := range s {
+		switch v.(type) {
+		case float64:
+			f := v.(float64)
+			if float64(int(f)) == f {
+				s[k] = int(f)
+			}
+		case map[string]interface{}:
+			t := New(v)
+			t.tryConvertFloat64()
+			s[k] = t
+		case []interface{}:
+			s[k] = tryConvertFloat64InSlice(v.([]interface{}))
+		}
+	}
+	return s
 }
 
 // FromBase64 creates a new Obj containing the data specified
diff --git a/map_test.go b/map_test.go
index aa8e536..6036cbb 100644
--- a/map_test.go
+++ b/map_test.go
@@ -92,6 +92,30 @@ func TestMapFromJSONWithError(t *testing.T) {
 	assert.Nil(t, m)
 }
 
+func TestConversionJSONInt(t *testing.T) {
+	jsonString :=
+		`{
+    "a": 1,
+    "b": {
+      "data": 1
+    },
+    "c": [1],
+    "d": [[1]]
+  }`
+	m, err := objx.FromJSON(jsonString)
+
+	assert.Nil(t, err)
+	require.NotNil(t, m)
+	assert.Equal(t, 1, m.Get("a").Int())
+	assert.Equal(t, 1, m.Get("b.data").Int())
+
+	assert.True(t, m.Get("c").IsInterSlice())
+	assert.Equal(t, 1, m.Get("c").InterSlice()[0])
+
+	assert.True(t, m.Get("d").IsInterSlice())
+	assert.Equal(t, []interface{}{1}, m.Get("d").InterSlice()[0])
+}
+
 func TestMapFromBase64String(t *testing.T) {
 	base64String := "eyJuYW1lIjoiTWF0In0="
 	o, err := objx.FromBase64(base64String)