Update to support API list methods refactor

Enable Scala 2.9.1 support

Author: anurag

build.sbt

@@ -6,7 +6,7 @@ organization := "com.stripe"
 
 scalaVersion := "2.9.0-1"
 
-crossScalaVersions := Seq("2.9.0", "2.9.0-1")
+crossScalaVersions := Seq("2.9.0", "2.9.0-1", "2.9.1")
 
 scalacOptions ++= Seq("-unchecked", "-deprecation")
 

src/main/scala/com/stripe/Stripe.scala

@@ -186,19 +186,23 @@ case class Charge(
   def refund(): Charge = request("POST", "%s/refund".format(instanceURL(this.id))).extract[Charge]
 }
 
+case class ChargeCollection(data: List[Charge])
+
 object Charge extends APIResource {
   def create(params: Map[String,_]): Charge = {
     return request("POST", classURL, params).extract[Charge]
   }
 
-  def all(params: Map[String,_] = Map.empty): List[Charge] = {
-    return request("GET", classURL, params).extract[List[Charge]]
-  }
-
   def retrieve(id: String): Charge = {
     return request("GET", instanceURL(id)).extract[Charge]
   }
+
+  def all(params: Map[String,_] = Map.empty): ChargeCollection = {
+    return request("GET", classURL, params).extract[ChargeCollection]
+  }
+
 }
+
 case class Customer(
   id: String,
   created: Long,
@@ -232,6 +236,8 @@ case class Customer(
 
 case class DeletedCustomer(id: String, deleted: Boolean)
 
+case class CustomerCollection(data: List[Customer])
+
 object Customer extends APIResource {
   def create(params: Map[String,_]): Customer = {
     return request("POST", classURL, params).extract[Customer]
@@ -241,8 +247,8 @@ object Customer extends APIResource {
     return request("GET", instanceURL(id)).extract[Customer]
   }
 
-  def all(params: Map[String,_] = Map.empty): List[Customer] = {
-    return request("GET", classURL, params).extract[List[Customer]]
+  def all(params: Map[String,_] = Map.empty): CustomerCollection = {
+    return request("GET", classURL, params).extract[CustomerCollection]
   }
 }
 
@@ -259,6 +265,8 @@ case class Plan(
   }
 }
 
+case class PlanCollection(data: List[Plan])
+
 case class DeletedPlan(id: String, deleted: Boolean)
 
 object Plan extends APIResource {
@@ -270,8 +278,8 @@ object Plan extends APIResource {
     return request("GET", instanceURL(id)).extract[Plan]
   }
 
-  def all(params: Map[String,_] = Map.empty): List[Plan] = {
-    return request("GET", classURL, params).extract[List[Plan]]
+  def all(params: Map[String,_] = Map.empty): PlanCollection = {
+    return request("GET", classURL, params).extract[PlanCollection]
   }
 }
 
@@ -317,6 +325,8 @@ extends APIResource {
 
 case class DeletedInvoiceItem(id: String, deleted: Boolean)
 
+case class InvoiceItemCollection(data: List[InvoiceItem])
+
 object InvoiceItem extends APIResource {
   def create(params: Map[String,_]): InvoiceItem = {
     return request("POST", classURL, params).extract[InvoiceItem]
@@ -326,8 +336,8 @@ object InvoiceItem extends APIResource {
     return request("GET", instanceURL(id)).extract[InvoiceItem]
   }
 
-  def all(params: Map[String,_] = Map.empty): List[InvoiceItem] = {
-    return request("GET", classURL, params).extract[List[InvoiceItem]]
+  def all(params: Map[String,_] = Map.empty): InvoiceItemCollection = {
+    return request("GET", classURL, params).extract[InvoiceItemCollection]
   }
 }
 
@@ -356,13 +366,15 @@ case class Invoice(
   lines: InvoiceLines) {
 }
 
+case class InvoiceCollection(data: List[Invoice])
+
 object Invoice extends APIResource {
   def retrieve(id: String): Invoice = {
     return request("GET", instanceURL(id)).extract[Invoice]
   }
 
-  def all(params: Map[String,_] = Map.empty): List[Invoice] = {
-    return request("GET", classURL, params).extract[List[Invoice]]
+  def all(params: Map[String,_] = Map.empty): InvoiceCollection = {
+    return request("GET", classURL, params).extract[InvoiceCollection]
   }
 
   def upcoming(params: Map[String, _]): Invoice = {

src/test/scala/com/stripe/StripeSuite.scala

@@ -51,7 +51,7 @@ class ChargeSuite extends FunSuite with StripeSuite {
 
   test("Charges can be listed") {
     val charge = Charge.create(DefaultChargeMap)
-    val charges = Charge.all()
+    val charges = Charge.all().data
     charges.head.isInstanceOf[Charge] should be (true)
   }
 
@@ -95,7 +95,7 @@ class CustomerSuite extends FunSuite with StripeSuite {
 
   test("Customers can be listed") {
     val customer = Customer.create(DefaultCustomerMap)
-    val customers = Customer.all()
+    val customers = Customer.all().data
     customers.head.isInstanceOf[Customer] should be (true)
   }
 }
@@ -121,7 +121,7 @@ class PlanSuite extends FunSuite with StripeSuite {
 
   test("Plans can be listed") {
     val plan = Plan.create(getUniquePlanMap)
-    val plans = Plan.all()
+    val plans = Plan.all().data
     plans.head.isInstanceOf[Plan] should be (true)
   }
 
@@ -194,7 +194,7 @@ class InvoiceItemSuite extends FunSuite with StripeSuite {
 
   test("InvoiceItems can be listed") {
     val invoiceItem = createDefaultInvoiceItem()
-    val invoiceItems = InvoiceItem.all()
+    val invoiceItems = InvoiceItem.all().data
     invoiceItems.head.isInstanceOf[InvoiceItem] should be (true)
   }
 }
@@ -203,7 +203,7 @@ class InvoiceSuite extends FunSuite with StripeSuite {
   test("Invoices can be retrieved individually") {
     val plan = Plan.create(getUniquePlanMap)
     val customer = Customer.create(DefaultCustomerMap + ("plan" -> plan.id))
-    val invoices = Invoice.all(Map("customer" -> customer.id))
+    val invoices = Invoice.all(Map("customer" -> customer.id)).data
     val createdInvoice = invoices.head
     val retrievedInvoice = Invoice.retrieve(createdInvoice.id.get)
     retrievedInvoice.id.get should equal (createdInvoice.id.get)
@@ -212,14 +212,14 @@ class InvoiceSuite extends FunSuite with StripeSuite {
   test("Invoices can be listed") {
     val plan = Plan.create(getUniquePlanMap)
     val customer = Customer.create(DefaultCustomerMap + ("plan" -> plan.id))
-    val invoices = Invoice.all()
+    val invoices = Invoice.all().data
     invoices.head.isInstanceOf[Invoice] should be (true)
   }
 
   test("Invoices can be retrieved for a customer") {
     val plan = Plan.create(getUniquePlanMap)
     val customer = Customer.create(DefaultCustomerMap + ("plan" -> plan.id))
-    val invoices = Invoice.all(Map("customer" -> customer.id))
+    val invoices = Invoice.all(Map("customer" -> customer.id)).data
     val invoice = invoices.head
     invoice.customer.get should equal (customer.id)
     val invoiceLineSubscription = invoice.lines.subscriptions.get.head