Merge pull request #183 from ktoso/wip-quoted-BIG-numbers-ktoso

+#182 allows BigInt/BigDecimal to be obtained from JsStrings

2 files changed, 8 insertions, 0 deletions

diff --git a/src/main/scala/spray/json/BasicFormats.scala b/src/main/scala/spray/json/BasicFormats.scala
index 96751f6..65b9ecb 100644
--- a/src/main/scala/spray/json/BasicFormats.scala
+++ b/src/main/scala/spray/json/BasicFormats.scala
@@ -79,6 +79,7 @@ trait BasicFormats {
     }
     def read(value: JsValue) = value match {
       case JsNumber(x) => x
+      case JsString(x) => BigDecimal(x)
       case x => deserializationError("Expected BigDecimal as JsNumber, but got " + x)
     }
   }
@@ -90,6 +91,7 @@ trait BasicFormats {
     }
     def read(value: JsValue) = value match {
       case JsNumber(x) => x.toBigInt
+      case JsString(x) => BigInt(x)
       case x => deserializationError("Expected BigInt as JsNumber, but got " + x)
     }
   }
diff --git a/src/test/scala/spray/json/BasicFormatsSpec.scala b/src/test/scala/spray/json/BasicFormatsSpec.scala
index 629c223..00da813 100644
--- a/src/test/scala/spray/json/BasicFormatsSpec.scala
+++ b/src/test/scala/spray/json/BasicFormatsSpec.scala
@@ -105,6 +105,9 @@ class BasicFormatsSpec extends Specification with DefaultJsonProtocol {
     "convert a JsNumber to a BigDecimal" in {
       JsNumber(42).convertTo[BigDecimal] mustEqual BigDecimal(42)
     }
+    """convert a JsString to a BigDecimal (to allow the quoted-large-numbers pattern)""" in {
+      JsString("9223372036854775809").convertTo[BigDecimal] mustEqual BigDecimal("9223372036854775809")
+    }
   }
   
   "The BigIntJsonFormat" should {
@@ -114,6 +117,9 @@ class BasicFormatsSpec extends Specification with DefaultJsonProtocol {
     "convert a JsNumber to a BigInt" in {
       JsNumber(42).convertTo[BigInt] mustEqual BigInt(42)
     }
+    """convert a JsString to a BigInt (to allow the quoted-large-numbers pattern)""" in {
+      JsString("9223372036854775809").convertTo[BigInt] mustEqual BigInt("9223372036854775809")
+    }
   }
   
   "The UnitJsonFormat" should {