stripe 1.41.0 → 1.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f758a647e45ad29868db9a730a4242bc5c28d28c
-  data.tar.gz: 5b9878c4db71d5d4f7690b2acc6e19cc9983b8ab
+  metadata.gz: d527e690f11344fa8621791ef6d1081060615be4
+  data.tar.gz: 4eb5cc04a3066b3b0fd41676c73e4dfc4d01d4db
 SHA512:
-  metadata.gz: c3626353eec44fecf27536bfc52a311018ec5734669384baafe285fd64adf3e30c0f4b0e1b44efa19cee111d7bd1434fdf30169b5342d3070bea5d5267cf4b87
-  data.tar.gz: 433941fb35789f121ab6518dcc3b2bf681ef75da67858bd42a85a649ca1818b8f80c31a91427dea4348ab59a8e1ea831c8208bc4ce16c50abde5d9c01499ab94
+  metadata.gz: 6c221fc569da0fa801dd6881aa782c907d20eff284539ca3851d30201d7d3b38704f64a038b65f0376391ed4fb53b651f8bfd707adf5ca92897e0e924de145e6
+  data.tar.gz: 865fa052fb613f85a6a3544c99579ee6a8b01146314ba794a7af1f486aff2f9e4713806b6d3a069bc102398ee63813b3e01edde6676e2975837a70b02ec5b962

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.42.0 2016-05-04
+
+* Add support for the new /v1/subscriptions endpoint
+  * Stripe::Subscription.retrieve
+  * Stripe::Subscription.list
+  * Stripe::Subscription.create
+  * Stripe::Subscription.update
+  * Stripe::Subscription.delete
+
 === 1.41.0 2016-04-13
 
 * Add global `stripe_account` option that adds a `Stripe-Account` header to all requests

data/VERSION

@@ -1 +1 @@
-1.41.0
+1.42.0

data/lib/stripe/subscription.rb

@@ -1,15 +1,9 @@
 module Stripe
   class Subscription < APIResource
+    extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Update
     include Stripe::APIOperations::Delete
-
-    def resource_url
-      "#{Customer.resource_url}/#{CGI.escape(customer)}/subscriptions/#{CGI.escape(id)}"
-    end
-
-    def self.retrieve(id, opts=nil)
-      raise NotImplementedError.new("Subscriptions cannot be retrieved without a customer ID. Retrieve a subscription using customer.subscriptions.retrieve('subscription_id')")
-    end
+    extend Stripe::APIOperations::List
 
     def delete_discount
       _, opts = request(:delete, discount_url)

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.41.0'
+  VERSION = '1.42.0'
 end

data/test/stripe/subscription_test.rb

@@ -2,71 +2,114 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Stripe
   class SubscriptionTest < Test::Unit::TestCase
-    should "subscriptions should be listable" do
+    should "subscriptions should be retrievable by customer" do
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      customer = Stripe::Customer.retrieve('c_test_customer')
+
+      @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/s_test_subscription", nil, nil).returns(make_response(make_subscription(:id => 's_test_subscription')))
+      subscription = customer.subscriptions.retrieve('s_test_subscription')
+    end
+
+    should "subscriptions should be listable by customer" do
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      customer = Stripe::Customer.retrieve('c_test_customer')
+
+      @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions", nil, nil).returns(make_response(make_customer_subscription_array('c_test_customer')))
+      subs = customer.subscriptions.all()
+
+      assert subs.kind_of? (Stripe::ListObject)
+      assert subs.data.kind_of?(Array)
+      assert subs.data[0].kind_of? Stripe::Subscription
+    end
+
+    should "subscriptions should be creatable by customer" do
       @mock.expects(:get).once.returns(make_response(make_customer))
+      customer = Stripe::Customer.retrieve('c_test_customer')
+
+      @mock.expects(:post).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions", nil, 'plan=silver').returns(make_response(make_subscription(:id => 'test_new_subscription')))
+      subscription = customer.subscriptions.create(:plan => 'silver')
+
+      assert_equal 'test_new_subscription', subscription.id
+    end
+
+    should "subscriptions should be retrievable" do
+      @mock.expects(:get).once.with("#{Stripe.api_base}/v1/subscriptions/s_test_subscription", nil, nil).returns(make_response(make_subscription))
+      sub = Stripe::Subscription.retrieve('s_test_subscription')
 
-      customer = Stripe::Customer.retrieve('test_customer')
+      assert sub.kind_of?(Stripe::Subscription)
+    end
+
+    should "subscriptions should be listable" do
+      @mock.expects(:get).once.returns(make_response(make_subscription_array))
+      subs = Stripe::Subscription.list.data
+
+      assert subs.kind_of? Array
+      assert subs[0].kind_of? Stripe::Subscription
+    end
+
+    should "subscriptions should be listable with filters" do
+      @mock.expects(:get).once.with("#{Stripe.api_base}/v1/subscriptions?customer=c_test_customer&limit=3&plan=gold", nil, nil).returns(make_response(make_subscription_array))
+      subs = Stripe::Subscription.all(:customer => 'c_test_customer', :limit => 3, :plan => 'gold')
 
-      assert customer.subscriptions.first.kind_of?(Stripe::Subscription)
+      assert subs.kind_of? (Stripe::ListObject)
+      assert subs.data.kind_of?(Array)
+      assert subs.data[0].kind_of? Stripe::Subscription
     end
 
     should "subscriptions should be refreshable" do
-      @mock.expects(:get).twice.returns(make_response(make_customer), make_response(make_subscription(:id => 'refreshed_subscription')))
+      @mock.expects(:get).twice.returns(make_response(make_subscription(:id => 'refreshed_subscription')))
 
-      customer = Stripe::Customer.retrieve('test_customer')
-      subscription = customer.subscriptions.first
-      subscription.refresh
+      sub = Stripe::Subscription.retrieve('s_test_subscription')
+      sub.refresh
 
-      assert_equal 'refreshed_subscription', subscription.id
+      assert_equal 'refreshed_subscription', sub.id
     end
 
     should "subscriptions should be deletable" do
-      @mock.expects(:get).once.returns(make_response(make_customer))
-      customer = Stripe::Customer.retrieve('test_customer')
-      subscription = customer.subscriptions.first
+      @mock.expects(:get).once.returns(make_response(make_subscription))
+      sub = Stripe::Subscription.retrieve('s_test_subscription')
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}?at_period_end=true", nil, nil).returns(make_response(make_subscription))
-      subscription.delete :at_period_end => true
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/subscriptions/#{sub.id}?at_period_end=true", nil, nil).returns(make_response(make_subscription))
+      sub.delete :at_period_end => true
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}", nil, nil).returns(make_response(make_subscription))
-      subscription.delete
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/subscriptions/#{sub.id}", nil, nil).returns(make_response(make_subscription))
+      sub.delete
     end
 
     should "subscriptions should be updateable" do
-      @mock.expects(:get).once.returns(make_response(make_customer))
-      @mock.expects(:post).once.returns(make_response(make_subscription({:status => 'active'})))
+      @mock.expects(:get).once.returns(make_response(make_subscription))
+      sub = Stripe::Subscription.retrieve('s_test_subscription')
+      assert_equal 'trialing', sub.status
 
-      customer = Stripe::Customer.retrieve('test_customer')
-      subscription = customer.subscriptions.first
-      assert_equal 'trialing', subscription.status
+      @mock.expects(:post).once.with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/subscriptions/#{sub.id}" && api_key.nil? && CGI.parse(params) == {'status' => ['active']}
+      end.returns(make_response(make_subscription(:status => 'active')))
 
-      subscription.status = 'active'
-      subscription.save
+      sub.status = 'active'
+      sub.save
 
-      assert_equal 'active', subscription.status
+      assert_equal 'active', sub.status
     end
 
     should "create should return a new subscription" do
-      @mock.expects(:get).once.returns(make_response(make_customer))
-      @mock.expects(:post).once.returns(make_response(make_subscription(:id => 'test_new_subscription')))
+      @mock.expects(:post).once.with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/subscriptions" && api_key.nil? && CGI.parse(params) == {'customer' => ['c_test_customer'], 'plan' => ['gold']}
+      end.returns(make_response(make_subscription(:plan => 'gold', :id => 'test_new_subscription')))
 
-      customer = Stripe::Customer.retrieve('test_customer')
-      subscription = customer.subscriptions.create(:plan => 'silver')
-      assert_equal 'test_new_subscription', subscription.id
+      sub = Stripe::Subscription.create(:plan => 'gold', :customer => 'c_test_customer')
+
+      assert_equal 'test_new_subscription', sub.id
+      assert_equal 'gold', sub.plan.identifier
     end
 
     should "be able to delete a subscriptions's discount" do
-      @mock.expects(:get).once.returns(make_response(make_customer))
-      @mock.expects(:post).once.returns(make_response(make_subscription(:id => 'test_new_subscription')))
-
-
-      customer = Stripe::Customer.retrieve('test_customer')
-      subscription = customer.subscriptions.create(:plan => 'silver')
+      @mock.expects(:post).once.returns(make_response(make_subscription))
+      sub = Stripe::Subscription.create(:plan => 'gold', :customer => 'c_test_customer', coupon: 'forever')
 
-      url = "#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/test_new_subscription/discount"
+      url = "#{Stripe.api_base}/v1/subscriptions/#{sub.id}/discount"
       @mock.expects(:delete).once.with(url, nil, nil).returns(make_response(make_delete_discount_response))
-      subscription.delete_discount
-      assert_equal nil, subscription.discount
+      sub.delete_discount
+      assert_equal nil, sub.discount
     end
   end
 end

data/test/test_data.rb

@@ -118,7 +118,7 @@ module Stripe
         :created => 1304114758,
         :sources => make_customer_card_array(id),
         :metadata => {},
-        :subscriptions => make_subscription_array(id)
+        :subscriptions => make_customer_subscription_array(id)
       }.merge(params)
     end
 
@@ -289,7 +289,15 @@ module Stripe
       }.merge(params)
     end
 
-    def make_subscription_array(customer_id)
+    def make_subscription_array
+      {
+        :data => [make_subscription, make_subscription, make_subscription],
+        :object => 'list',
+        :resource_url => '/v1/subscriptions'
+      }
+    end
+
+    def make_customer_subscription_array(customer_id)
       {
         :data => [make_subscription, make_subscription, make_subscription],
         :object => 'list',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.41.0
+  version: 1.42.0
 platform: ruby
 authors:
 - Ross Boucher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client