stripe 1.40.0 → 1.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df8595ba1c8112e53a16598f41277d6fe8e0f120
-  data.tar.gz: c4511690653728df59c9e060ed1e01967fdd8e4e
+  metadata.gz: f758a647e45ad29868db9a730a4242bc5c28d28c
+  data.tar.gz: 5b9878c4db71d5d4f7690b2acc6e19cc9983b8ab
 SHA512:
-  metadata.gz: abab2102477a032ee062eade9b36b4a99a2704c5e831d7e43d9500ca63e7d6bd800dd256ec6ee3525d585cde3b2da3244326a9c134e28125eb879ee65e30cd8a
-  data.tar.gz: 725cb8e7ac1c6899311a750a90b905451340b41f34ed5a737d420d20108791366beb7f475d384760497c2345a8a6b622b1e23c9472fbc18bc1c7b03a6b91ce96
+  metadata.gz: c3626353eec44fecf27536bfc52a311018ec5734669384baafe285fd64adf3e30c0f4b0e1b44efa19cee111d7bd1434fdf30169b5342d3070bea5d5267cf4b87
+  data.tar.gz: 433941fb35789f121ab6518dcc3b2bf681ef75da67858bd42a85a649ca1818b8f80c31a91427dea4348ab59a8e1ea831c8208bc4ce16c50abde5d9c01499ab94

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.41.0 2016-04-13
+
+* Add global `stripe_account` option that adds a `Stripe-Account` header to all requests
+
 === 1.40.0 2016-04-06
 
 * Fix bug that omitted subresources from serialization

data/VERSION

@@ -1 +1 @@
-1.40.0
+1.41.0

data/lib/stripe.rb

@@ -82,7 +82,7 @@ module Stripe
   @read_timeout = 80
 
   class << self
-    attr_accessor :api_key, :api_base, :verify_ssl_certs, :api_version, :connect_base, :uploads_base,
+    attr_accessor :stripe_account, :api_key, :api_base, :verify_ssl_certs, :api_version, :connect_base, :uploads_base,
                   :open_timeout, :read_timeout
 
     attr_reader :max_network_retry_delay, :initial_network_retry_delay
@@ -208,7 +208,7 @@ module Stripe
       else
         response = handle_restclient_error(e, request_opts, retry_count, api_base_url)
       end
-    rescue RestClient::Exception, Errno::ECONNREFUSED => e
+    rescue RestClient::Exception, Errno::ECONNREFUSED, OpenSSL::SSL::SSLError => e
       response = handle_restclient_error(e, request_opts, retry_count, api_base_url)
     end
 
@@ -278,10 +278,11 @@ module Stripe
     # It is only safe to retry network failures on post and delete
     # requests if we add an Idempotency-Key header
     if [:post, :delete].include?(method) && self.max_network_retries > 0
-      headers[:idempotency_key] ||= SecureRandom.uuid 
+      headers[:idempotency_key] ||= SecureRandom.uuid
     end
 
     headers[:stripe_version] = api_version if api_version
+    headers[:stripe_account] = stripe_account if stripe_account
 
     begin
       headers.update(:x_stripe_client_user_agent => JSON.generate(user_agent))
@@ -384,6 +385,12 @@ module Stripe
       message = "The connection to the server (#{api_base_url}) broke before the " \
         "request completed. #{connection_message}"
 
+    when OpenSSL::SSL::SSLError
+      message = "Could not establish a secure connection to Stripe, you may " \
+                "need to upgrade your OpenSSL version. To check, try running " \
+                "'openssl s_client -connect api.stripe.com:443' from the " \
+                "command line."
+
     when RestClient::SSLCertificateNotVerified
       message = "Could not verify Stripe's SSL certificate. " \
         "Please make sure that your network is not intercepting certificates. " \

data/lib/stripe/api_operations/list.rb

@@ -3,7 +3,6 @@ module Stripe
     module List
       def list(filters={}, opts={})
         opts = Util.normalize_opts(opts)
-        opts = @opts.merge(opts) if @opts
 
         response, opts = request(:get, resource_url, filters, opts)
         obj = ListObject.construct_from(response, opts)

data/lib/stripe/charge.rb

@@ -13,7 +13,7 @@ module Stripe
       # an `Array` and fall back to the old refund URL if necessary so as to
       # maintain internal compatibility.
       unless self.refunds.is_a?(Array)
-        refund = self.refunds.create(params, opts)
+        self.refunds.create(params, opts)
 
         # now that a refund has been created, we expect the state of this object
         # to change as well (i.e. `refunded` will now be `true`) so refresh it

data/lib/stripe/stripe_object.rb

@@ -32,7 +32,7 @@ module Stripe
     # considered to be equal if they have the same set of values and each one
     # of those values is the same.
     def ==(other)
-      @values == other.instance_variable_get(:@values)
+      other.is_a?(StripeObject) && @values == other.instance_variable_get(:@values)
     end
 
     # Indicates whether or not the resource has been deleted on the server.

data/lib/stripe/subscription.rb

@@ -12,7 +12,7 @@ module Stripe
     end
 
     def delete_discount
-      response, opts = request(:delete, discount_url)
+      _, opts = request(:delete, discount_url)
       initialize_from({ :discount => nil }, opts, true)
     end
 

data/lib/stripe/transfer.rb

@@ -5,7 +5,7 @@ module Stripe
     include Stripe::APIOperations::Update
 
     def cancel
-      response, api_key = Stripe.request(:post, cancel_url, @api_key)
+      response, api_key = self.request(:post, cancel_url)
       initialize_from(response, api_key)
     end
 

data/lib/stripe/util.rb

@@ -120,7 +120,7 @@ module Stripe
 
       # do not sort the final output because arrays (and arrays of hashes
       # especially) can be order sensitive, but do sort incoming parameters
-      params.sort_by { |(k, v)| k.to_s }.each do |key, value|
+      params.sort_by { |(k, _)| k.to_s }.each do |key, value|
         calculated_key = parent_key ? "#{parent_key}[#{key}]" : "#{key}"
         if value.is_a?(Hash)
           result += flatten_params(value, calculated_key)

data/lib/stripe/version.rb

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

data/test/stripe/api_resource_test.rb

@@ -445,7 +445,7 @@ module Stripe
           opts[:url] == "#{Stripe.api_base}/v1/customers/c_test_customer" &&
           opts[:headers][:stripe_account] == 'acct_abc'
         end.once.returns(make_response(make_customer))
-        c = Stripe::Customer.retrieve("c_test_customer", {:stripe_account => 'acct_abc'})
+        Stripe::Customer.retrieve("c_test_customer", {:stripe_account => 'acct_abc'})
       end
 
       should "passing in a stripe_account header should pass it through on save" do
@@ -695,6 +695,19 @@ module Stripe
         assert_equal "myid", result.id
       end
 
+      # We retry the request if we receive SSL errors, since these can be caused
+      # by transient network issues, in addition to compatibility issues between
+      # the client and server.
+      should 'retry failed network requests if they fail with OpenSSL::SSL::SSLError' do
+        Stripe.expects(:sleep_time).at_least_once.returns(0)
+        @mock.expects(:post).times(3).with('https://api.stripe.com/v1/charges', nil, 'amount=50&currency=usd').raises(OpenSSL::SSL::SSLError.new('message'))
+
+        err = assert_raises Stripe::APIConnectionError do
+          Stripe::Charge.create(:amount => 50, :currency => 'usd', :card => { :number => nil })
+        end
+        assert_match(/Request was retried 2 times/, err.message)
+      end
+
       should 'not retry a SSLCertificateNotVerified error' do
         @mock.expects(:post).times(1).with('https://api.stripe.com/v1/charges', nil, 'amount=50&currency=usd').raises(RestClient::SSLCertificateNotVerified.new('message'))
 

data/test/stripe/bitcoin_receiver_test.rb

@@ -47,14 +47,14 @@ module Stripe
     should "delete a bitcoin receiver with no customer through top-level API" do
       @mock.expects(:delete).with("#{Stripe.api_base}/v1/bitcoin/receivers/btcrcv_test_receiver", nil, nil).once.returns(make_response({:deleted => true, :id => "btcrcv_test_receiver"}))
       receiver = Stripe::BitcoinReceiver.construct_from(make_bitcoin_receiver)
-      response = receiver.delete
+      receiver.delete
       assert(receiver.deleted)
     end
 
     should "delete a bitcoin receiver with a customer through customer's subresource API" do
       @mock.expects(:delete).with("#{Stripe.api_base}/v1/customers/customer_foo/sources/btcrcv_test_receiver", nil, nil).once.returns(make_response({:deleted => true, :id => "btcrcv_test_receiver"}))
       receiver = Stripe::BitcoinReceiver.construct_from(make_bitcoin_receiver(:customer => 'customer_foo'))
-      response = receiver.delete
+      receiver.delete
       assert(receiver.deleted)
     end
   end

data/test/stripe/charge_test.rb

@@ -72,6 +72,12 @@ module Stripe
       assert c.card.kind_of?(Stripe::StripeObject) && c.card.object == 'card'
     end
 
+    should "charges should have Outcome objects associated with their outcome property" do
+      @mock.expects(:get).once.returns(make_response(make_charge))
+      c = Stripe::Charge.retrieve("test_charge")
+      assert c.outcome.kind_of?(Stripe::StripeObject) && c.outcome.type == 'authorized'
+    end
+
     should "execute should return a new, fully executed charge when passed correct `card` parameters" do
       @mock.expects(:post).with do |url, api_key, params|
         url == "#{Stripe.api_base}/v1/charges" && api_key.nil? && CGI.parse(params) == {

data/test/stripe/stripe_object_test.rb

@@ -283,7 +283,7 @@ module Stripe
       e = assert_raises ArgumentError do
         obj.foo = ""
       end
-      assert_match /\(object\).foo = nil/, e.message
+      assert_match %r{\(object\).foo = nil}, e.message
     end
   end
 end

data/test/stripe_test.rb

@@ -33,4 +33,19 @@ class StripeTest < Test::Unit::TestCase
       Stripe.max_network_retries = old
     end
   end
+
+  should "makes requests with the Stripe-Account header" do
+    response = make_account(
+      charges_enabled: false,
+      details_submitted: false,
+      email: "test+bindings@stripe.com"
+    )
+    Stripe.stripe_account = 'acct_1234'
+
+    Stripe.expects(:execute_request).with(
+      has_entry(:headers, has_entry(:stripe_account, 'acct_1234')),
+    ).returns(make_response(response))
+
+    Stripe.request(:post, '/v1/account', 'sk_live12334566')
+  end
 end

data/test/test_data.rb

@@ -152,7 +152,13 @@ module Stripe
         :object => "charge",
         :created => 1304114826,
         :refunds => make_refund_array(id),
-        :metadata => {}
+        :metadata => {},
+        :outcome => {
+          type: 'authorized',
+          reason: nil,
+          seller_message: 'Payment complete.',
+          network_status: 'approved_by_network',
+        },
       }.merge(params)
     end
 

data/test/test_helper.rb

@@ -13,6 +13,10 @@ module Stripe
     @mock_rest_client = mock_client
   end
 
+  class << self
+    remove_method :execute_request
+  end
+
   def self.execute_request(opts)
     get_params = (opts[:headers] || {})[:params]
     post_params = opts[:payload]

metadata

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