Add no-arg Customer.cancelSubscription.

Also expose additional props on Subscriptions. Version Bump.

Author: anurag

README.md

@@ -17,14 +17,14 @@ Add this dependency to your project's POM:
     <dependency>
       <groupId>com.stripe</groupId>
       <artifactId>stripe-java</artifactId>
-      <version>1.0.7</version>
+      <version>1.0.8</version>
     </dependency>
 
 ### Others
 
 You'll need to manually install the following JARs:
 
-* The Stripe JAR from https://code.stripe.com/stripe-java-1.0.7.jar
+* The Stripe JAR from https://code.stripe.com/stripe-java-1.0.8.jar
 * [Google Gson](http://code.google.com/p/google-gson/) from <http://google-gson.googlecode.com/files/google-gson-1.7.1-release.zip>.
 
 Usage

VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.stripe</groupId>
     <artifactId>stripe-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
     <name>stripe-java</name>
     <url>https://github.com/stripe/stripe-java</url>
     <dependencies>

src/main/java/com/stripe/Stripe.java

@@ -3,6 +3,6 @@
 public abstract class Stripe
 {
 	public static final String API_BASE = "https://api.stripe.com/v1";
-	public static final String VERSION = "1.0.7";
+	public static final String VERSION = "1.0.8";
 	public static String apiKey;
 }

src/main/java/com/stripe/model/Customer.java

@@ -132,6 +132,10 @@ public Subscription updateSubscription(Map<String, Object> params) throws Stripe
 				params, Subscription.class);
 	}
 
+	public Subscription cancelSubscription() throws StripeException {
+		return cancelSubscription(null);
+	}
+	
 	public Subscription cancelSubscription(Map<String, Object> params) throws StripeException {
 		return request(RequestMethod.DELETE,
 				String.format("%s/subscription", instanceURL(Customer.class, this.id)),

src/main/java/com/stripe/model/Subscription.java

@@ -10,6 +10,8 @@ public class Subscription extends StripeObject {
 	Long trialStart;
 	Long trialEnd;
 	Plan plan;
+	Long canceledAt;
+	Long endedAt;
 
 	public Long getCurrentPeriodEnd() {
 		return currentPeriodEnd;
@@ -59,4 +61,16 @@ public Plan getPlan() {
 	public void setPlan(Plan plan) {
 		this.plan = plan;
 	}
+	public Long getCanceledAt() {
+		return canceledAt;
+	}
+	public void setCanceledAt(Long canceledAt) {
+		this.canceledAt = canceledAt;
+	}
+	public Long getEndedAt() {
+		return endedAt;
+	}
+	public void setEndedAt(Long endedAt) {
+		this.endedAt = endedAt;
+	}
 }

src/test/java/com/stripe/StripeTest.java

@@ -224,7 +224,7 @@ public void testInvalidCard() throws StripeException {
 		Plan plan = Plan.create(getUniquePlanParams());
 		Customer customer = createDefaultCustomerWithPlan(plan);
 		assertEquals(customer.getSubscription().getStatus(), "active");
-		Subscription canceledSubscription = customer.cancelSubscription(null);
+		Subscription canceledSubscription = customer.cancelSubscription();
 		assertEquals(canceledSubscription.getStatus(), "canceled");
 	}