stripe 1.55.0 → 1.55.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acc0d005430ccecaa1ee91d83f1fa12878953539
-  data.tar.gz: 8e0a9f98e8931de91bda3da3f3bb6e506772c7e6
+  metadata.gz: 1a4bdfe3a97b5c7b3d7a1c5c5ace530dd4ef4b0c
+  data.tar.gz: aa5aacbe6bc4dc1dd5982e8c4ef4346a5cf890e6
 SHA512:
-  metadata.gz: 9ebb54c179ef98c86a461fcd98d354faf8ffaae89e94e910fc372f12f7657ba1213dca4d035e7448a8a5231ca5836ce8d94d59a220c7aeb71b9aa2199b6b4833
-  data.tar.gz: 8076a031bf92dd1daba197cd4f8a8557ae1c2a1d326f4d2b7541a24ce09e323091527c0b5fb60b45757e066c022a70ca38882c7dfc3203d41658fc5813863265
+  metadata.gz: bf05983e41c5ae0b5a4390c7f3557da1df08ead492fca1d13f08a6e9fc171715c723767587da01023285ffb55052502944c795c9e07a05167e595bffb9009986
+  data.tar.gz: b5e01f1265f2ebc91b221011ca5f435167704ce7781de700b879593fdf29ed3ad5f0df55f75376de0e9efb49e88dc95a29d6a85829fa6290329ce673b2e7db74

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.55.1 2016-10-24
+
+* Add accessors for new fields added in `#update_attributes`
+
 === 1.55.0 2016-09-15
 
 * Add support for Apple Pay domains

data/README.md

@@ -121,8 +121,8 @@ certificates.
 ### max_network_retries
 
 When `max_network_retries` is set to a positive integer, stripe will retry
-requests that fail on a network error. Idempotency keys will be added to post
-and get requests to ensure the safety of retrying. There will be a short delay
+requests that fail on a network error. Idempotency keys will be added to `POST`
+and `DELETE` requests to ensure the safety of retrying. There will be a short delay
 between each retry, with an exponential backoff algorithm used to determine the
 length of the delay. Default value is 0.
 

data/VERSION

@@ -1 +1 @@
-1.55.0
+1.55.1

data/lib/stripe.rb

@@ -43,6 +43,7 @@ require 'stripe/recipient'
 require 'stripe/bank_account'
 require 'stripe/card'
 require 'stripe/subscription'
+require 'stripe/subscription_item'
 require 'stripe/application_fee'
 require 'stripe/refund'
 require 'stripe/reversal'
@@ -66,6 +67,7 @@ require 'stripe/errors/api_connection_error'
 require 'stripe/errors/card_error'
 require 'stripe/errors/invalid_request_error'
 require 'stripe/errors/authentication_error'
+require 'stripe/errors/permission_error'
 require 'stripe/errors/rate_limit_error'
 
 module Stripe
@@ -377,6 +379,8 @@ module Stripe
       raise authentication_error(error, resp, error_obj)
     when 402
       raise card_error(error, resp, error_obj)
+    when 403
+      raise permission_error(error, resp, error_obj)
     when 429
       raise rate_limit_error(error, resp, error_obj)
     else
@@ -405,6 +409,10 @@ module Stripe
                   resp.code, resp.body, error_obj, resp.headers)
   end
 
+  def self.permission_error(error, resp, error_obj)
+    PermissionError.new(error[:message], resp.code, resp.body, error_obj, resp.headers)
+  end
+
   def self.api_error(error, resp, error_obj)
     APIError.new(error[:message], resp.code, resp.body, error_obj, resp.headers)
   end

data/lib/stripe/errors/permission_error.rb

@@ -0,0 +1,4 @@
+module Stripe
+  class PermissionError < StripeError
+  end
+end

data/lib/stripe/stripe_object.rb

@@ -84,8 +84,8 @@ module Stripe
       # Default to true. TODO: Convert to optional arguments after we're off
       # 1.9 which will make this quite a bit more clear.
       dirty = method_options.fetch(:dirty, true)
-
       values.each do |k, v|
+        add_accessors([k], values) unless metaclass.method_defined?(k.to_sym)
         @values[k] = Util.convert_to_stripe_object(v, opts)
         dirty_value!(@values[k]) if dirty
         @unsaved_values.add(k)

data/lib/stripe/subscription.rb

@@ -12,6 +12,16 @@ module Stripe
       initialize_from({ :discount => nil }, opts, true)
     end
 
+    def self.update(id, params={}, opts={})
+      params[:items] = Util.array_to_hash(params[:items]) if params[:items]
+      super(id, params, opts)
+    end
+
+    def self.create(params={}, opts={})
+      params[:items] = Util.array_to_hash(params[:items]) if params[:items]
+      super(params, opts)
+    end
+
     private
 
     def discount_url

data/lib/stripe/subscription_item.rb

@@ -0,0 +1,12 @@
+module Stripe
+  class SubscriptionItem < APIResource
+    extend Stripe::APIOperations::Create
+    include Stripe::APIOperations::Delete
+    extend Stripe::APIOperations::List
+    include Stripe::APIOperations::Save
+
+    def self.resource_url
+      '/v1/subscription_items'
+    end
+  end
+end

data/lib/stripe/util.rb

@@ -23,38 +23,39 @@ module Stripe
         'list' => ListObject,
 
         # business objects
-        'account' => Account,
-        'alipay_account' => AlipayAccount,
-        'application_fee' => ApplicationFee,
-        'balance' => Balance,
-        'balance_transaction' => BalanceTransaction,
-        'bank_account' => BankAccount,
-        'card' => Card,
-        'charge' => Charge,
-        'country_spec' => CountrySpec,
-        'coupon' => Coupon,
-        'customer' => Customer,
-        'event' => Event,
-        'fee_refund' => ApplicationFeeRefund,
-        'invoiceitem' => InvoiceItem,
-        'invoice' => Invoice,
-        'plan' => Plan,
-        'recipient' => Recipient,
-        'refund' => Refund,
-        'subscription' => Subscription,
-        'file_upload' => FileUpload,
-        'token' => Token,
-        'transfer' => Transfer,
-        'transfer_reversal' => Reversal,
-        'bitcoin_receiver' => BitcoinReceiver,
-        'bitcoin_transaction' => BitcoinTransaction,
-        'dispute' => Dispute,
-        'product' => Product,
-        'sku' => SKU,
-        'order' => Order,
-        'order_return' => OrderReturn,
-        'three_d_secure' => ThreeDSecure,
-        'apple_pay_domain' => ApplePayDomain,
+        'account'                 => Account,
+        'alipay_account'          => AlipayAccount,
+        'apple_pay_domain'        => ApplePayDomain,
+        'application_fee'         => ApplicationFee,
+        'balance'                 => Balance,
+        'balance_transaction'     => BalanceTransaction,
+        'bank_account'            => BankAccount,
+        'bitcoin_receiver'        => BitcoinReceiver,
+        'bitcoin_transaction'     => BitcoinTransaction,
+        'card'                    => Card,
+        'charge'                  => Charge,
+        'country_spec'            => CountrySpec,
+        'coupon'                  => Coupon,
+        'customer'                => Customer,
+        'dispute'                 => Dispute,
+        'event'                   => Event,
+        'fee_refund'              => ApplicationFeeRefund,
+        'file_upload'             => FileUpload,
+        'invoice'                 => Invoice,
+        'invoiceitem'             => InvoiceItem,
+        'order'                   => Order,
+        'order_return'            => OrderReturn,
+        'plan'                    => Plan,
+        'product'                 => Product,
+        'recipient'               => Recipient,
+        'refund'                  => Refund,
+        'sku'                     => SKU,
+        'subscription'            => Subscription,
+        'subscription_item'       => SubscriptionItem,
+        'token'                   => Token,
+        'transfer'                => Transfer,
+        'transfer_reversal'       => Reversal,
+        'three_d_secure'          => ThreeDSecure,
       }
     end
 
@@ -120,6 +121,20 @@ module Stripe
         map { |k,v| "#{url_encode(k)}=#{url_encode(v)}" }.join('&')
     end
 
+    # Transforms an array into a hash with integer keys. Used for a small
+    # number of API endpoints. If the argument is not an Array, return it
+    # unchanged. Example: [{foo: 'bar'}] => {"0" => {foo: "bar"}}
+    def self.array_to_hash(array)
+      case array
+      when Array
+        hash = {}
+        array.each_with_index { |v,i| hash[i.to_s] = v }
+        hash
+      else
+        array
+      end
+    end
+
     # Encodes a string in a way that makes it suitable for use in a set of
     # query parameters in a URI or in a set of form parameters in a request
     # body.

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.55.0'
+  VERSION = '1.55.1'
 end

data/test/stripe/api_resource_test.rb

@@ -300,6 +300,18 @@ module Stripe
         end
       end
 
+      should "a 403 should give a PermissionError with http status, body, and JSON body" do
+        response = make_response(make_missing_id_error, 403)
+        @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 403))
+        begin
+          Stripe::Customer.retrieve("foo")
+        rescue Stripe::PermissionError => e
+          assert_equal(403, e.http_status)
+          assert_equal(true, !!e.http_body)
+          assert_equal(true, e.json_body.kind_of?(Hash))
+        end
+      end
+
       should "a 404 should give an InvalidRequestError with http status, body, and JSON body" do
         response = make_response(make_missing_id_error, 404)
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))

data/test/stripe/invoice_test.rb

@@ -44,5 +44,23 @@ module Stripe
       i.pay
       assert_equal nil, i.next_payment_attempt
     end
+
+    should "be able to retrieve upcoming invoices" do
+      base = "#{Stripe.api_base}/v1/invoices/upcoming?"
+      cus_sub = "customer=c_test_customer&subscription=s_test_subscription&"
+      item0 = "subscription_items[][plan]=gold&subscription_items[][quantity]=1&"
+      item1 = "subscription_items[][plan]=silver&subscription_items[][quantity]=2"
+      @mock.expects(:get).once.with(base + cus_sub + item0 + item1, nil, nil).
+        returns(make_response(make_invoice(:customer => 'c_test_customer', :subscription => 's_test_subscription')))
+
+      i = Stripe::Invoice.upcoming(
+        :customer => 'c_test_customer',
+        :subscription => 's_test_subscription',
+        :subscription_items => [{:plan => 'gold', :quantity =>1}, {:plan => 'silver', :quantity =>2}]
+      )
+
+      assert_equal 'c_test_customer', i.customer
+      assert_equal 's_test_subscription', i.subscription
+    end
   end
 end

data/test/stripe/stripe_object_test.rb

@@ -90,6 +90,13 @@ module Stripe
       assert_equal Stripe::StripeObject, obj.metadata.class
     end
 
+    should "create accessors when #update_attributes is called" do
+      obj = Stripe::StripeObject.construct_from({})
+      assert_equal false, obj.send(:metaclass).method_defined?(:foo)
+      obj.update_attributes(:foo => 'bar')
+      assert_equal true, obj.send(:metaclass).method_defined?(:foo)
+    end
+    
     should "warn that #refresh_from is deprecated" do
       old_stderr = $stderr
       $stderr = StringIO.new

data/test/stripe/subscription_item_test.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Stripe
+  class SubscriptionItemTest < Test::Unit::TestCase
+    should "subscription items should be retrievable" do
+      @mock.expects(:get).once.with("#{Stripe.api_base}/v1/subscription_items/si_test_subscription_item", nil, nil).
+        returns(make_response(make_subscription_item))
+
+      sub_item = Stripe::SubscriptionItem.retrieve('si_test_subscription_item')
+
+      assert sub_item.kind_of?(Stripe::SubscriptionItem)
+    end
+
+    should "subscription items should be listable" do
+      @mock.expects(:get).once.with("#{Stripe.api_base}/v1/subscription_items?subscription=s_test_subscription&limit=3", nil, nil).
+        returns(make_response(make_subscription_item_array))
+      sub_items = Stripe::SubscriptionItem.list(:subscription => 's_test_subscription', :limit => 3).data
+
+      assert sub_items.kind_of? Array
+      assert sub_items[0].kind_of? Stripe::SubscriptionItem
+    end
+
+    should "subscription items should be deletable" do
+      @mock.expects(:get).once.returns(make_response(make_subscription_item))
+      sub_item = Stripe::SubscriptionItem.retrieve('si_test_subscription_item')
+
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/subscription_items/#{sub_item.id}", nil, nil).
+        returns(make_response(make_subscription_item))
+      sub_item.delete
+    end
+
+    should "subscription items should be updateable" do
+      sid = 'si_test_subscription_item'
+      @mock.expects(:post).once.with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/subscription_items/#{sid}" &&
+          api_key.nil? &&
+          CGI.parse(params) == {'plan' => ['silver'], 'quantity' => ['3']}
+      end.returns(make_response(make_subscription_item(:plan => 'silver', :quantity => 3)))
+
+      sub_item = Stripe::SubscriptionItem.update(sid, {:plan => 'silver', :quantity => 3})
+
+      assert_equal 'silver', sub_item.plan.id
+      assert_equal 3, sub_item.quantity
+    end
+
+    should "subscription items should be saveable" do
+      @mock.expects(:get).once.returns(make_response(make_subscription_item))
+      sub_item = Stripe::SubscriptionItem.retrieve('si_test_subscription_item')
+
+      @mock.expects(:post).once.with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/subscription_items/#{sub_item.id}" &&
+          api_key.nil? &&
+          CGI.parse(params) == {'plan' => ['silver'], 'quantity' => ['3']}
+      end.returns(make_response(make_subscription_item(:plan => 'silver', :quantity => 3)))
+
+      sub_item.plan = 'silver'
+      sub_item.quantity = 3
+      sub_item.save
+
+      assert_equal 'silver', sub_item.plan.id
+      assert_equal 3, sub_item.quantity
+    end
+
+    should "create should return a new subscription item" do
+      @mock.expects(:post).once.with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/subscription_items" && api_key.nil? &&
+          CGI.parse(params) == {'plan' => ['silver'], 'quantity' => ['3']}
+      end.returns(make_response(make_subscription_item(:plan => 'silver', :quantity => 3)))
+
+      sub_item = Stripe::SubscriptionItem.create(:plan => 'silver', :quantity => 3)
+
+      assert_equal 'silver', sub_item.plan.id
+      assert_equal 3, sub_item.quantity
+    end
+  end
+end

data/test/stripe/subscription_test.rb

@@ -87,6 +87,52 @@ module Stripe
       assert_equal 'active', sub.status
     end
 
+    should "subscription items should be updateable" do
+      sid = 's_test_subscription'
+      items = {:data => [{:plan => {:id =>'gold'}, :quantity => 1}, {:plan => {:id =>'silver'}, :quantity => 2}]}
+
+      @mock.expects(:post).once.with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/subscriptions/#{sid}" &&
+          api_key.nil? &&
+          CGI.parse(params) == {
+            'items[0][plan]' => ['gold'],
+            'items[0][quantity]' => ['1'],
+            'items[1][plan]' => ['silver'],
+            'items[1][quantity]' => ['2'],
+          }
+      end.returns(make_response(make_subscription(:items => items)))
+
+      sub = Stripe::Subscription.update(sid, :items => [{:plan => 'gold', :quantity =>1}, {:plan => 'silver', :quantity =>2}])
+
+      assert_equal 'gold', sub.items.data[0].plan.id
+      assert_equal 1, sub.items.data[0].quantity
+      assert_equal 'silver', sub.items.data[1].plan.id
+      assert_equal 2, sub.items.data[1].quantity
+    end
+
+    should "subscription items should be updateable with hash" do
+      sid = 's_test_subscription'
+      items = {:data => [{:plan => {:id =>'gold'}, :quantity => 1}, {:plan => {:id =>'silver'}, :quantity => 2}]}
+
+      @mock.expects(:post).once.with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/subscriptions/#{sid}" &&
+          api_key.nil? &&
+          CGI.parse(params) == {
+            'items[0][plan]' => ['gold'],
+            'items[0][quantity]' => ['1'],
+            'items[1][plan]' => ['silver'],
+            'items[1][quantity]' => ['2'],
+          }
+      end.returns(make_response(make_subscription(:items => items)))
+
+      sub = Stripe::Subscription.update(sid, :items => {'0' => {:plan => 'gold', :quantity =>1}, '1' => {:plan => 'silver', :quantity =>2}})
+
+      assert_equal 'gold', sub.items.data[0].plan.id
+      assert_equal 1, sub.items.data[0].quantity
+      assert_equal 'silver', sub.items.data[1].plan.id
+      assert_equal 2, sub.items.data[1].quantity
+    end
+
     should "subscriptions should be saveable" do
       @mock.expects(:get).once.returns(make_response(make_subscription))
       sub = Stripe::Subscription.retrieve('s_test_subscription')
@@ -113,6 +159,30 @@ module Stripe
       assert_equal 'gold', sub.plan.identifier
     end
 
+    should "create with items should return a new subscription" do
+      items = {:data => [{:plan => {:id =>'gold'}, :quantity => 1}, {:plan => {:id =>'silver'}, :quantity => 2}]}
+
+      @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'],
+            'items[0][plan]' => ['gold'],
+            'items[0][quantity]' => ['1'],
+            'items[1][plan]' => ['silver'],
+            'items[1][quantity]' => ['2'],
+          }
+      end.returns(make_response(make_subscription(:items => items, :id => 'test_new_subscription')))
+
+      sub = Stripe::Subscription.create(:customer => 'c_test_customer', :items => [{:plan => 'gold', :quantity =>1}, {:plan => 'silver', :quantity =>2}])
+
+      assert_equal 'test_new_subscription', sub.id
+      assert_equal 'gold', sub.items.data[0].plan.id
+      assert_equal 1, sub.items.data[0].quantity
+      assert_equal 'silver', sub.items.data[1].plan.id
+      assert_equal 2, sub.items.data[1].quantity
+    end
+
     should "be able to delete a subscriptions's discount" do
       @mock.expects(:post).once.returns(make_response(make_subscription))
       sub = Stripe::Subscription.create(:plan => 'gold', :customer => 'c_test_customer', coupon: 'forever')

data/test/stripe/util_test.rb

@@ -141,5 +141,9 @@ module Stripe
       obj = Util.convert_to_stripe_object([1, 2, 3], {})
       assert_equal [1, 2, 3], obj
     end
+
+    should "#array_to_hash should convert an array into a hash with integer keys" do
+      assert_equal({"0" => 1, "1" => 2, "2" => 3}, Util.array_to_hash([1, 2, 3]))
+    end
   end
 end

data/test/test_data.rb

@@ -277,6 +277,24 @@ module Stripe
       }.merge(params)
     end
 
+    def make_subscription_item(params = {})
+      plan = params.delete(:plan) || 'gold'
+      {
+        :id => "si_test_subscription_item",
+        :object => "subscription_item",
+        :created => 1473875521,
+        :plan => {
+          :id => plan,
+          :object => "plan",
+          :amount => 1000,
+          :created => 1468349629,
+          :currency => "usd",
+          :interval => "month",
+        },
+        :quantity => 1
+      }.merge(params)
+    end
+
     def make_refund(params = {})
       {
         :object => 'refund',
@@ -297,6 +315,14 @@ module Stripe
       }
     end
 
+    def make_subscription_item_array
+      {
+        :data => [make_subscription_item, make_subscription_item, make_subscription_item],
+        :object => 'list',
+        :resource_url => '/v1/subscription_items'
+      }
+    end
+
     def make_customer_subscription_array(customer_id)
       {
         :data => [make_subscription, make_subscription, make_subscription],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.55.0
+  version: 1.55.1
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -77,6 +77,7 @@ files:
 - lib/stripe/errors/authentication_error.rb
 - lib/stripe/errors/card_error.rb
 - lib/stripe/errors/invalid_request_error.rb
+- lib/stripe/errors/permission_error.rb
 - lib/stripe/errors/rate_limit_error.rb
 - lib/stripe/errors/stripe_error.rb
 - lib/stripe/event.rb
@@ -96,6 +97,7 @@ files:
 - lib/stripe/source.rb
 - lib/stripe/stripe_object.rb
 - lib/stripe/subscription.rb
+- lib/stripe/subscription_item.rb
 - lib/stripe/three_d_secure.rb
 - lib/stripe/token.rb
 - lib/stripe/transfer.rb
@@ -136,6 +138,7 @@ files:
 - test/stripe/sku_test.rb
 - test/stripe/source_test.rb
 - test/stripe/stripe_object_test.rb
+- test/stripe/subscription_item_test.rb
 - test/stripe/subscription_test.rb
 - test/stripe/three_d_secure_test.rb
 - test/stripe/transfer_test.rb
@@ -202,6 +205,7 @@ test_files:
 - test/stripe/sku_test.rb
 - test/stripe/source_test.rb
 - test/stripe/stripe_object_test.rb
+- test/stripe/subscription_item_test.rb
 - test/stripe/subscription_test.rb
 - test/stripe/three_d_secure_test.rb
 - test/stripe/transfer_test.rb