Merge pull request #46 from vanilla-rtb/master

fix StringOrNumber for empty strings

Author: dim

numbers.go

@@ -36,7 +36,7 @@ type StringOrNumber string
 
 // UnmarshalJSON implements json.Unmarshaler
 func (n *StringOrNumber) UnmarshalJSON(data []byte) error {
-	if len(data) > 2 && data[0] == '"' && data[len(data)-1] == '"' {
+	if len(data) >= 2 && data[0] == '"' && data[len(data)-1] == '"' {
 		var v string
 		if err := json.Unmarshal(data, &v); err != nil {
 			return err

numbers_test.go

@@ -44,11 +44,24 @@ var _ = Describe("StringOrNumber", func() {
 		Expect(n).To(Equal(StringOrNumber("33")))
 	})
 
+	It("should decode strings", func() {
+		var n StringOrNumber
+		Expect(json.Unmarshal([]byte(`""`), &n)).To(Succeed())
+		Expect(n).To(Equal(StringOrNumber("")))
+	})
+
 	It("should encode to strings", func() {
 		var n StringOrNumber = "33"
 		bin, err := json.Marshal(n)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(string(bin)).To(Equal(`"33"`))
 	})
 
+	It("should encode to strings", func() {
+		var n StringOrNumber = ""
+		bin, err := json.Marshal(n)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(string(bin)).To(Equal(`""`))
+	})
+
 })