stripe 1.44.0 → 1.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119a28c4474b441d0acfc5e6ebbbf47038e9e509
-  data.tar.gz: 14c9aeb9e6f6a78a73b7bfa2cd94b4135a627eff
+  metadata.gz: 5ed148072cc048ea24b62fc7a64645d8714eec90
+  data.tar.gz: 2f478d4c522c9cff1cf502328289233f0b71c8b2
 SHA512:
-  metadata.gz: 0f7809e7801f9a9f32b82680b8d0ff02fa90348cd7753a08c46aa61745e8b70900465fe263635e07ac01df29abc424b5bfe38320bd82ea723cf652edb4101430
-  data.tar.gz: efede3fa5a4f1e3f4ffbb3c2f21820aa4f7b948442d1ab83acf79485826735068bce355331bfc005770a8ad0d77611c106ae156faae4bcc998576abafdfc269d
+  metadata.gz: 4035922aa5bd4d02bf82ea89c52c645cf761ebbedea8ca165b81a6a379af363b9a027911313d447c7db9e846e633774780a0e838b9771c3aaf0fa132992028e2
+  data.tar.gz: ee89f0e1140edeead9e86733d3467468dcdf94551b35878ae438e0acd7dd70ec3a68ca66e3acf5e29d23d194f8cd59bb4641e5d0e6c2eb8efd6ebbe8dc991f1e

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   gem 'mocha', '~> 0.13.2'
   gem 'pry'
   gem 'rake'
-  gem 'shoulda', '~> 3.4.0'
+  gem 'shoulda-context'
   gem 'test-unit'
 
   platforms :mri do

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.45.0 2016-07-07
+
+* Do not send subresources when updating except when explicitly told to do so (see #433)
+
 === 1.44.0 2016-06-29
 
 * Add `update` class method to all resources that can be updated

data/VERSION

@@ -1 +1 @@
-1.44.0
+1.45.0

data/lib/stripe.rb

@@ -424,15 +424,16 @@ module Stripe
   end
 
   def self.sleep_time(retry_count)
-    # This method was adapted from https://github.com/ooyala/retries/blob/master/lib/retries.rb
-
-    # The sleep time is an exponentially-increasing function of base_sleep_seconds. But, it never exceeds
-    # max_sleep_seconds.
+    # Apply exponential backoff with initial_network_retry_delay on the number
+    # of attempts so far as inputs. Do not allow the number to exceed
+    # max_network_retry_delay.
     sleep_seconds = [initial_network_retry_delay * (2 ** (retry_count - 1)), max_network_retry_delay].min
-    # Randomize to a random value in the range sleep_seconds/2 .. sleep_seconds
 
+    # Apply some jitter by randomizing the value in the range of (sleep_seconds
+    # / 2) to (sleep_seconds).
     sleep_seconds = sleep_seconds * (0.5 * (1 + rand()))
-    # But never sleep less than base_sleep_seconds
+
+    # But never sleep less than the base sleep seconds.
     sleep_seconds = [initial_network_retry_delay, sleep_seconds].max
 
     sleep_seconds

data/lib/stripe/api_resource.rb

@@ -2,6 +2,13 @@ module Stripe
   class APIResource < StripeObject
     include Stripe::APIOperations::Request
 
+    # A flag that can be set a behavior that will cause this resource to be
+    # encoded and sent up along with an update of its parent resource. This is
+    # usually not desirable because resources are updated individually on their
+    # own endpoints, but there are certain cases, replacing a customer's source
+    # for example, where this is allowed.
+    attr_accessor :save_with_parent
+
     def self.class_name
       self.name.split('::')[-1]
     end

data/lib/stripe/customer.rb

@@ -5,6 +5,23 @@ module Stripe
     include Stripe::APIOperations::Save
     extend Stripe::APIOperations::List
 
+    # Set or replace a customer's default source.
+    def source=(value)
+      super
+
+      # The parent setter will perform certain useful operations like
+      # converting to an APIResource if appropriate.
+      value = self.source
+
+      # Note that source may be a card, but could also be a tokenized card's ID
+      # (which is a string), and so we check its type here.
+      if value.is_a?(APIResource)
+        value.save_with_parent = true
+      end
+
+      value
+    end
+
     def add_invoice_item(params, opts={})
       opts = @opts.merge(Util.normalize_opts(opts))
       InvoiceItem.create(params.merge(:customer => id), opts)

data/lib/stripe/stripe_object.rb

@@ -326,11 +326,25 @@ module Stripe
     end
 
     def serialize_params_value(value, original, unsaved, force)
-      case value
-      when nil
+      case true
+      when value == nil
         ''
 
-      when Array
+      # The logic here is that essentially any object embedded in another
+      # object that had a `type` is actually an API resource of a different
+      # type that's been included in the response. These other resources must
+      # be updated from their proper endpoints, and therefore they are not
+      # included when serializing even if they've been modified.
+      #
+      # There are _some_ known exceptions though. For example, to save on API
+      # calls it's sometimes desirable to update a customer's default source by
+      # setting a new card (or other) object with `#source=` and then saving
+      # the customer. The `#save_with_parent` flag to override the default
+      # behavior allows us to handle these exceptions.
+      when value.is_a?(APIResource) && !value.save_with_parent
+        nil
+
+      when value.is_a?(Array)
         update = value.map { |v| serialize_params_value(v, nil, true, force) }
 
         # This prevents an array that's unchanged from being resent.
@@ -350,10 +364,10 @@ module Stripe
       # existing array being held by a StripeObject. This could happen for
       # example by appending a new hash onto `additional_owners` for an
       # account.
-      when Hash
+      when value.is_a?(Hash)
         Util.convert_to_stripe_object(value, @opts).serialize_params
 
-      when StripeObject
+      when value.is_a?(StripeObject)
         update = value.serialize_params(:force => force)
 
         # If the entire object was replaced, then we need blank each field of

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.44.0'
+  VERSION = '1.45.0'
 end

data/test/stripe/api_resource_test.rb

@@ -551,6 +551,21 @@ module Stripe
         acct.save
       end
 
+      should 'not save nested API resources' do
+        ch = Stripe::Charge.construct_from({
+          :id => 'charge_id',
+          :customer => {
+            :object => 'customer',
+            :id => 'customer_id'
+          }
+        })
+
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/charges/charge_id", nil, '').returns(make_response({"id" => "charge_id"}))
+
+        ch.customer.description = 'Bob'
+        ch.save
+      end
+
       should 'correctly handle replaced nested objects' do
         acct = Stripe::Account.construct_from({
           :id => 'myid',

data/test/stripe/customer_test.rb

@@ -92,5 +92,20 @@ module Stripe
       c.delete_discount
       assert_equal nil, c.discount
     end
+
+    should "can have a token source set" do
+      c = Stripe::Customer.new("test_customer")
+      c.source = "tok_123"
+      assert_equal "tok_123", c.source
+    end
+
+    should "set a flag if given an object source" do
+      c = Stripe::Customer.new("test_customer")
+      c.source = {
+        :object => 'card'
+      }
+      assert_equal true, c.source.save_with_parent
+    end
   end
 end
+

data/test/stripe/stripe_object_test.rb

@@ -240,6 +240,27 @@ module Stripe
       assert_equal([{ :foo => "bar" }], serialized[:metadata])
     end
 
+    should "#serialize_params and remove embedded APIResources" do
+      obj = Stripe::StripeObject.construct_from({
+        :customer => Customer.construct_from({})
+      })
+
+      serialized = obj.serialize_params
+      assert_equal({}, serialized)
+    end
+
+    should "#serialize_params and remove embedded APIResources unless flagged with save_with_parent" do
+      c = Customer.construct_from({})
+      c.save_with_parent = true
+
+      obj = Stripe::StripeObject.construct_from({
+        :customer => c,
+      })
+
+      serialized = obj.serialize_params
+      assert_equal({ :customer => {} }, serialized)
+    end
+
     should "#serialize_params takes a force option" do
       obj = Stripe::StripeObject.construct_from({
         :id => 'id',

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'stripe'
 require 'test/unit'
 require 'mocha/setup'
 require 'stringio'
-require 'shoulda'
+require 'shoulda/context'
 require File.expand_path('../test_data', __FILE__)
 
 # monkeypatch request methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.44.0
+  version: 1.45.0
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client