stripe 1.9.9 → 1.10.0

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 gemfile:
   - gemfiles/default-with-activesupport.gemfile
   - gemfiles/json.gemfile

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.10.0 2014-01-29
+
+* Support for multiple subscriptions per customer
+
 === 1.9.9 2013-12-02
 
 * Add ApplicationFee API resource

data/VERSION

@@ -1 +1 @@
-1.9.9
+1.10.0

data/lib/stripe.rb

@@ -36,6 +36,7 @@ require 'stripe/event'
 require 'stripe/transfer'
 require 'stripe/recipient'
 require 'stripe/card'
+require 'stripe/subscription'
 require 'stripe/application_fee'
 
 # Errors

data/lib/stripe/api_operations/delete.rb

@@ -1,8 +1,8 @@
 module Stripe
   module APIOperations
     module Delete
-      def delete
-        response, api_key = Stripe.request(:delete, url, @api_key)
+      def delete(params = {})
+        response, api_key = Stripe.request(:delete, url, @api_key, params)
         refresh_from(response, api_key)
         self
       end

data/lib/stripe/card.rb

@@ -2,6 +2,7 @@ module Stripe
   class Card < APIResource
     include Stripe::APIOperations::Update
     include Stripe::APIOperations::Delete
+    include Stripe::APIOperations::List
 
     def url
       "#{Customer.url}/#{CGI.escape(customer)}/cards/#{CGI.escape(id)}"

data/lib/stripe/customer.rb

@@ -25,6 +25,10 @@ module Stripe
       Charge.all({ :customer => id }, @api_key)
     end
 
+    def create_upcoming_invoice(params={})
+      Invoice.create(params.merge(:customer => id), @api_key)
+    end
+
     def cancel_subscription(params={})
       response, api_key = Stripe.request(:delete, subscription_url, @api_key, params)
       refresh_from({ :subscription => response }, api_key, true)

data/lib/stripe/stripe_object.rb

@@ -102,6 +102,12 @@ module Stripe
       @values.each(&blk)
     end
 
+    if RUBY_VERSION < '1.9.2'
+      def respond_to?(symbol)
+        @values.has_key?(symbol) || super
+      end
+    end
+
     protected
 
     def metaclass
@@ -164,5 +170,9 @@ module Stripe
         end
       end
     end
+
+    def respond_to_missing?(symbol, include_private = false)
+      @values.has_key?(symbol) || super
+    end
   end
 end

data/lib/stripe/subscription.rb

@@ -0,0 +1,25 @@
+module Stripe
+  class Subscription < APIResource
+    include Stripe::APIOperations::Update
+    include Stripe::APIOperations::Delete
+
+    def url
+      "#{Customer.url}/#{CGI.escape(customer)}/subscriptions/#{CGI.escape(id)}"
+    end
+
+    def self.retrieve(id, api_key=nil)
+      raise NotImplementedError.new("Subscriptions cannot be retrieved without a customer ID. Retrieve a subscription using customer.subscriptions.retrieve('subscription_id')")
+    end
+
+    def delete_discount
+      Stripe.request(:delete, discount_url, @api_key)
+      refresh_from({ :discount => nil }, api_key, true)
+    end
+
+    private
+
+    def discount_url
+      url + '/discount'
+    end
+  end
+end

data/lib/stripe/util.rb

@@ -29,6 +29,7 @@ module Stripe
         'transfer' => Transfer,
         'recipient' => Recipient,
         'card' => Card,
+        'subscription' => Subscription,
         'list' => ListObject,
         'application_fee' => ApplicationFee
       }

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.9.9'
+  VERSION = '1.10.0'
 end

data/stripe.gemspec

@@ -10,6 +10,7 @@ spec = Gem::Specification.new do |s|
   s.authors = ['Ross Boucher', 'Greg Brockman']
   s.email = ['boucher@stripe.com', 'gdb@stripe.com']
   s.homepage = 'https://stripe.com/api'
+  s.license = 'MIT'
 
   s.add_dependency('rest-client', '~> 1.4')
   s.add_dependency('mime-types', '~> 1.25')

data/test/stripe/customer_test.rb

@@ -32,13 +32,19 @@ module Stripe
       assert_equal "c_test_customer", c.id
     end
 
+    should "create_upcoming_invoice should create a new invoice" do
+      @mock.expects(:post).once.returns(test_response(test_invoice))
+      i = Stripe::Customer.new("test_customer").create_upcoming_invoice
+      assert_equal "c_test_customer", i.customer
+    end
+
     should "be able to update a customer's subscription" do
       @mock.expects(:get).once.returns(test_response(test_customer))
       c = Stripe::Customer.retrieve("test_customer")
 
       @mock.expects(:post).once.with do |url, api_key, params|
         url == "#{Stripe.api_base}/v1/customers/c_test_customer/subscription" && api_key.nil? && CGI.parse(params) == {'plan' => ['silver']}
-      end.returns(test_response(test_subscription('silver')))
+      end.returns(test_response(test_subscription(:plan => 'silver')))
       s = c.update_subscription({:plan => 'silver'})
 
       assert_equal 'subscription', s.object
@@ -51,10 +57,10 @@ module Stripe
 
       # Not an accurate response, but whatever
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscription?at_period_end=true", nil, nil).returns(test_response(test_subscription('silver')))
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscription?at_period_end=true", nil, nil).returns(test_response(test_subscription(:plan => 'silver')))
       c.cancel_subscription({:at_period_end => 'true'})
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscription", nil, nil).returns(test_response(test_subscription('silver')))
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscription", nil, nil).returns(test_response(test_subscription(:plan => 'silver')))
       c.cancel_subscription
     end
 

data/test/stripe/invoice_test.rb

@@ -8,6 +8,12 @@ module Stripe
       assert_equal 'in_test_invoice', i.id
     end
 
+    should "create should create a new invoice" do
+      @mock.expects(:post).once.returns(test_response(test_invoice))
+      i = Stripe::Invoice.create
+      assert_equal "in_test_invoice", i.id
+    end
+
     should "pay should pay an invoice" do
       @mock.expects(:get).once.returns(test_response(test_invoice))
       i = Stripe::Invoice.retrieve('in_test_invoice')
@@ -17,4 +23,4 @@ module Stripe
       assert_equal i.next_payment_attempt, nil
     end
   end
-end
+end

data/test/stripe/stripe_object_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Stripe
+  class StripeObjectTest < Test::Unit::TestCase
+    should "implement #respond_to correctly" do
+      obj = Stripe::StripeObject.construct_from({ :some_key => "something", :id => 123 })
+
+      assert obj.respond_to?(:id)
+      assert obj.respond_to?(:some_key)
+      assert !obj.respond_to?(:some_other_key)
+    end
+  end
+end

data/test/stripe/subscription_test.rb

@@ -0,0 +1,72 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Stripe
+  class SubscriptionTest < Test::Unit::TestCase
+    should "subscriptions should be listable" do
+      @mock.expects(:get).once.returns(test_response(test_customer))
+
+      customer = Stripe::Customer.retrieve('test_customer')
+
+      assert customer.subscriptions.first.kind_of?(Stripe::Subscription)
+    end
+
+    should "subscriptions should be refreshable" do
+      @mock.expects(:get).twice.returns(test_response(test_customer), test_response(test_subscription(:id => 'refreshed_subscription')))
+
+      customer = Stripe::Customer.retrieve('test_customer')
+      subscription = customer.subscriptions.first
+      subscription.refresh
+
+      assert_equal subscription.id, 'refreshed_subscription'
+    end
+
+    should "subscriptions should be deletable" do
+      @mock.expects(:get).once.returns(test_response(test_customer))
+      customer = Stripe::Customer.retrieve('test_customer')
+      subscription = customer.subscriptions.first
+
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}?at_period_end=true", nil, nil).returns(test_response(test_subscription))
+      subscription.delete :at_period_end => true
+
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}", nil, nil).returns(test_response(test_subscription))
+      subscription.delete
+    end
+
+    should "subscriptions should be updateable" do
+      @mock.expects(:get).once.returns(test_response(test_customer))
+      @mock.expects(:post).once.returns(test_response(test_subscription({:status => 'active'})))
+
+      customer = Stripe::Customer.retrieve('test_customer')
+      subscription = customer.subscriptions.first
+      assert_equal subscription.status, 'trialing'
+
+      subscription.status = 'active'
+      subscription.save
+
+      assert_equal subscription.status, 'active'
+    end
+
+    should "create should return a new subscription" do
+      @mock.expects(:get).once.returns(test_response(test_customer))
+      @mock.expects(:post).once.returns(test_response(test_subscription(:id => 'test_new_subscription')))
+
+      customer = Stripe::Customer.retrieve('test_customer')
+      subscription = customer.subscriptions.create(:plan => 'silver')
+      assert_equal subscription.id, 'test_new_subscription'
+    end
+
+    should "be able to delete a subscriptions's discount" do
+      @mock.expects(:get).once.returns(test_response(test_customer))
+      @mock.expects(:post).once.returns(test_response(test_subscription(:id => 'test_new_subscription')))
+
+
+      customer = Stripe::Customer.retrieve("test_customer")
+      subscription = customer.subscriptions.create(:plan => 'silver')
+
+      url = "#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/test_new_subscription/discount"
+      @mock.expects(:delete).once.with(url, nil, nil).returns(test_response(test_delete_discount_response))
+      subscription.delete_discount
+      assert_equal nil, subscription.discount
+    end
+  end
+end

data/test/test_helper.rb

@@ -94,17 +94,19 @@ def test_application_fee_array
 end
 
 def test_customer(params={})
+  id = params[:id] || 'c_test_customer'
   {
     :subscription_history => [],
     :bills => [],
     :charges => [],
     :livemode => false,
     :object => "customer",
-    :id => "c_test_customer",
+    :id => id,
     :default_card => "cc_test_card",
     :created => 1304114758,
-    :cards => test_card_array('c_test_customer'),
-    :metadata => {}
+    :cards => test_card_array(id),
+    :metadata => {},
+    :subscriptions => test_subscription_array(id)
   }.merge(params)
 end
 
@@ -180,7 +182,8 @@ def test_coupon(params={})
 end
 
 #FIXME nested overrides would be better than hardcoding plan_id
-def test_subscription(plan_id="gold")
+def test_subscription(params = {})
+  plan = params.delete(:plan) || 'gold'
   {
     :current_period_end => 1308681468,
     :status => "trialing",
@@ -189,14 +192,23 @@ def test_subscription(plan_id="gold")
       :amount => 7500,
       :trial_period_days => 30,
       :object => "plan",
-      :identifier => plan_id
+      :identifier => plan
     },
     :current_period_start => 1308595038,
     :start => 1308595038,
     :object => "subscription",
     :trial_start => 1308595038,
     :trial_end => 1308681468,
-    :customer => "c_test_customer"
+    :customer => "c_test_customer",
+    :id => 's_test_subscription'
+  }.merge(params)
+end
+
+def test_subscription_array(customer_id)
+  {
+    :data => [test_subscription, test_subscription, test_subscription],
+    :object => 'list',
+    :url => '/v1/customers/' + customer_id + '/subscriptions'
   }
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -183,6 +183,7 @@ files:
 - lib/stripe/recipient.rb
 - lib/stripe/singleton_api_resource.rb
 - lib/stripe/stripe_object.rb
+- lib/stripe/subscription.rb
 - lib/stripe/token.rb
 - lib/stripe/transfer.rb
 - lib/stripe/util.rb
@@ -197,10 +198,13 @@ files:
 - test/stripe/invoice_test.rb
 - test/stripe/list_object_test.rb
 - test/stripe/metadata_test.rb
+- test/stripe/stripe_object_test.rb
+- test/stripe/subscription_test.rb
 - test/stripe/util_test.rb
 - test/test_helper.rb
 homepage: https://stripe.com/api
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -233,5 +237,8 @@ test_files:
 - test/stripe/invoice_test.rb
 - test/stripe/list_object_test.rb
 - test/stripe/metadata_test.rb
+- test/stripe/stripe_object_test.rb
+- test/stripe/subscription_test.rb
 - test/stripe/util_test.rb
 - test/test_helper.rb
+has_rdoc: