stripe 1.23.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf9ef8e5a7343b1993b9b828ff317326bf78591
-  data.tar.gz: fdae2b4926156adfa71f047dd830f1ff1032c3a8
+  metadata.gz: 7ecbd18ba821963c6f74fe3f77824f17abc2fe69
+  data.tar.gz: 88b6c051bb7a499cd1b0fe9ca017c56ee6ad3290
 SHA512:
-  metadata.gz: 5628f1bdbf7b87c0ed664944d60373923741d286bf26e037224a99039930a542beddd15f86304b081cdfd80619926719bee81302ba8a5b2e4823df763b9024fb
-  data.tar.gz: 20de174deab2c119dd0521cf700354a7d90cdbd948ef2980ef65d50678edccb54b5f9ff7eb62359d857b770671c3f28059aab40eed62ee2e8d1671ff8457e5d0
+  metadata.gz: 8bcd08d62d22be5862e078ec20c574c2dde8045ebc4a9897853dbf695909e5a62ac9ea8cd417d9385aeba2078ff42ab9221f55e10aa9412f7d43a9fc5ca099d3
+  data.tar.gz: 09b0cb29cba10c861f4453cb648df2dacea2e7d1424ad1a1b141083b6ff5cb3f5cfbd105665aa22c98777e7df1e8d095733e4188c9eb16f911cf1d475453137a

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.24.0 2015-08-03
+
+* Added support for deleting managed accounts
+* Added support for dispute listing and retrieval
+* Bugfix: token objects now are the correct class
+
 === 1.23.0 2015-07-06
 
 * Added request IDs and HTTP headers to errors.

data/README.rdoc

@@ -1,4 +1,4 @@
-= Stripe Ruby bindings {<img src="https://travis-ci.org/stripe/stripe-ruby.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/stripe/stripe-ruby] {<img src="https://gemnasium.com/stripe/stripe-ruby.png" alt="Dependency Status" />}[https://gemnasium.com/stripe/stripe-ruby]
+= Stripe Ruby bindings {<img src="https://travis-ci.org/stripe/stripe-ruby.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/stripe/stripe-ruby]
 
 == Documentation
 

data/VERSION

@@ -1 +1 @@
-1.23.0
+1.24.0

data/lib/stripe.rb

@@ -48,6 +48,7 @@ require 'stripe/reversal'
 require 'stripe/application_fee_refund'
 require 'stripe/bitcoin_receiver'
 require 'stripe/bitcoin_transaction'
+require 'stripe/dispute'
 
 # Errors
 require 'stripe/errors/stripe_error'
@@ -66,9 +67,12 @@ module Stripe
   @ssl_bundle_path  = DEFAULT_CA_BUNDLE_PATH
   @verify_ssl_certs = true
 
+  @open_timeout = 30
+  @read_timeout = 80
 
   class << self
-    attr_accessor :api_key, :api_base, :verify_ssl_certs, :api_version, :connect_base, :uploads_base
+    attr_accessor :api_key, :api_base, :verify_ssl_certs, :api_version, :connect_base, :uploads_base,
+                  :open_timeout, :read_timeout
   end
 
   def self.api_url(url='', api_base_url=nil)
@@ -123,8 +127,8 @@ module Stripe
     end
 
     request_opts.update(:headers => request_headers(api_key).update(headers),
-                        :method => method, :open_timeout => 30,
-                        :payload => payload, :url => url, :timeout => 80)
+                        :method => method, :open_timeout => open_timeout,
+                        :payload => payload, :url => url, :timeout => read_timeout)
 
     begin
       response = execute_request(request_opts)

data/lib/stripe/account.rb

@@ -1,6 +1,7 @@
 module Stripe
   class Account < APIResource
     include Stripe::APIOperations::Create
+    include Stripe::APIOperations::Delete
     include Stripe::APIOperations::List
     include Stripe::APIOperations::Update
 

data/lib/stripe/dispute.rb

@@ -0,0 +1,16 @@
+module Stripe
+  class Dispute < APIResource
+    include Stripe::APIOperations::List
+    include Stripe::APIOperations::Create
+    include Stripe::APIOperations::Update
+
+    def close(params={}, opts={})
+      response, opts = request(:post, close_url, params, opts)
+      refresh_from(response, opts)
+    end
+
+    def close_url
+      url + '/close'
+    end
+  end
+end

data/lib/stripe/list_object.rb

@@ -16,7 +16,8 @@ module Stripe
     end
 
     def retrieve(id, opts={})
-      response, opts = request(:get,"#{url}/#{CGI.escape(id)}", {}, opts)
+      id, retrieve_params = Util.normalize_id(id)
+      response, opts = request(:get,"#{url}/#{CGI.escape(id)}", retrieve_params, opts)
       Util.convert_to_stripe_object(response, opts)
     end
 

data/lib/stripe/stripe_object.rb

@@ -10,15 +10,7 @@ module Stripe
     end
 
     def initialize(id=nil, opts={})
-      # parameter overloading!
-      if id.kind_of?(Hash)
-        @retrieve_params = id.dup
-        @retrieve_params.delete(:id)
-        id = id[:id]
-      else
-        @retrieve_params = {}
-      end
-
+      id, @retrieve_params = Util.normalize_id(id)
       @opts = opts
       @values = {}
       # This really belongs in APIResource, but not putting it there allows us

data/lib/stripe/util.rb

@@ -39,10 +39,12 @@ module Stripe
         'refund' => Refund,
         'subscription' => Subscription,
         'file_upload' => FileUpload,
+        'token' => Token,
         'transfer' => Transfer,
         'transfer_reversal' => Reversal,
         'bitcoin_receiver' => BitcoinReceiver,
-        'bitcoin_transaction' => BitcoinTransaction
+        'bitcoin_transaction' => BitcoinTransaction,
+        'dispute' => Dispute
       }
     end
 
@@ -110,7 +112,7 @@ module Stripe
       result = []
       value.each do |elem|
         if elem.is_a?(Hash)
-          result += flatten_params(elem, calculated_key)
+          result += flatten_params(elem, "#{calculated_key}[]")
         elsif elem.is_a?(Array)
           result += flatten_params_array(elem, calculated_key)
         else
@@ -120,6 +122,16 @@ module Stripe
       result
     end
 
+    def self.normalize_id(id)
+      if id.kind_of?(Hash) # overloaded id
+        params_hash = id.dup
+        id = params_hash.delete(:id)
+      else
+        params_hash = {}
+      end
+      [id, params_hash]
+    end
+
     # The secondary opts argument can either be a string or hash
     # Turn this value into an api_key and a set of headers
     def self.normalize_opts(opts)

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.23.0'
+  VERSION = '1.24.0'
 end

data/test/stripe/api_resource_test.rb

@@ -93,6 +93,19 @@ module Stripe
       ch.refresh
     end
 
+    should "send expand when fetching through ListObject" do
+      @mock.expects(:get).once.
+        with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).
+        returns(make_response(make_customer))
+
+      @mock.expects(:get).once.
+        with("#{Stripe.api_base}/v1/customers/c_test_customer/sources/cc_test_card?expand[]=customer", nil, nil).
+        returns(make_response(make_card))
+
+      customer = Stripe::Customer.retrieve('c_test_customer')
+      customer.sources.retrieve({:id => 'cc_test_card', :expand => [:customer]})
+    end
+
     should "send stripe account as header when set" do
       stripe_account = "acct_0000"
       Stripe.expects(:execute_request).with do |opts|
@@ -112,6 +125,29 @@ module Stripe
         'sk_test_local')
     end
 
+    should "have default open and read timeouts" do
+      assert_equal Stripe.open_timeout, 30
+      assert_equal Stripe.read_timeout, 80
+    end
+
+    should "allow configurable open and read timeouts" do
+      original_timeouts = Stripe.open_timeout, Stripe.read_timeout
+
+      begin
+        Stripe.open_timeout = 999
+        Stripe.read_timeout = 998
+
+        Stripe.expects(:execute_request).with do |opts|
+          opts[:open_timeout] == 999 && opts[:timeout] == 998
+        end.returns(make_response(make_charge))
+
+        Stripe::Charge.create({:card => {:number => '4242424242424242'}},
+          'sk_test_local')
+      ensure
+        Stripe.open_timeout, Stripe.read_timeout = original_timeouts
+      end
+    end
+
     context "when specifying per-object credentials" do
       context "with no global API key set" do
         should "use the per-object credential when creating" do

data/test/stripe/charge_test.rb

@@ -95,5 +95,24 @@ module Stripe
       })
       assert c.paid
     end
+
+    should "properly handle an array or dictionaries" do
+      @mock.expects(:post).with do |url, api_key, params|
+        url == "#{Stripe.api_base}/v1/charges" && api_key.nil? && CGI.parse(params) == {
+          'currency' => ['usd'], 'amount' => ['100'],
+          'source' => ['btcrcv_test_receiver'],
+          'level3[][red]' => ['firstred', 'another'],
+          'level3[][one]' => ['fish'],
+        }
+      end.once.returns(make_response(make_charge))
+
+      c = Stripe::Charge.create({
+        :amount => 100,
+        :source => 'btcrcv_test_receiver',
+        :currency => "usd",
+        :level3 => [{:red => 'firstred'}, {:one => 'fish', :red => 'another'}]
+      })
+      assert c.paid
+    end
   end
 end

data/test/stripe/dispute_test.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Stripe
+  class DisputeTest < Test::Unit::TestCase
+    should "disputes should be retrievable" do
+      @mock.expects(:get).once.returns(make_response(make_dispute))
+      d = Stripe::Dispute.retrieve('dp_test_dispute')
+      assert d.kind_of?(Stripe::Dispute)
+    end
+
+    should "disputes should be listable" do
+      @mock.expects(:get).once.returns(make_response(make_dispute_array))
+      d = Stripe::Dispute.all
+      assert d.data.kind_of? Array
+      d.each do |dispute|
+        assert dispute.kind_of?(Stripe::Dispute)
+      end
+    end
+
+    should "disputes should be closeable" do
+      @mock.expects(:get).never
+      @mock.expects(:post).with(
+        "#{Stripe.api_base}/v1/disputes/test_dispute/close",
+        nil,
+        ''
+      ).once.returns(make_response({:id => 'dp_test_dispute', :status => 'lost'}))
+      d = Stripe::Dispute.new('test_dispute')
+      d.close
+    end
+
+    should "disputes should be updateable" do
+      @mock.expects(:get).once.returns(make_response(make_dispute))
+      @mock.expects(:post).with(
+        "#{Stripe.api_base}/v1/disputes/dp_test_dispute",
+        nil,
+        'evidence[customer_name]=customer'
+      ).once.returns(make_response(make_dispute))
+
+      d = Stripe::Dispute.new('test_dispute')
+      d.refresh
+      d.evidence['customer_name'] = 'customer'
+      d.save
+    end
+  end
+end

data/test/test_data.rb

@@ -156,6 +156,31 @@ module Stripe
       }
     end
 
+
+    def make_dispute(params={})
+      id = params[:id] || 'dp_test_dispute'
+      {
+        :id => id,
+        :charge => "ch_test_charge",
+        :amount => 500,
+        :created => 1304114758,
+        :status => 'needs_response',
+        :livemode => false,
+        :currency => 'usd',
+        :object => 'dispute',
+        :reason => 'fraudulent',
+        :evidence => {},
+      }.merge(params)
+    end
+
+    def make_dispute_array
+      {
+        :data => [make_dispute, make_dispute, make_dispute],
+        :object => 'list',
+        :url => '/v1/disputes'
+      }
+    end
+
     def make_recipient_card_array(recipient_id)
       {
         :data => [make_card, make_card, make_card],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors:
 - Ross Boucher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -138,6 +138,7 @@ files:
 - lib/stripe/charge.rb
 - lib/stripe/coupon.rb
 - lib/stripe/customer.rb
+- lib/stripe/dispute.rb
 - lib/stripe/errors/api_connection_error.rb
 - lib/stripe/errors/api_error.rb
 - lib/stripe/errors/authentication_error.rb
@@ -171,6 +172,7 @@ files:
 - test/stripe/coupon_test.rb
 - test/stripe/customer_card_test.rb
 - test/stripe/customer_test.rb
+- test/stripe/dispute_test.rb
 - test/stripe/file_upload_test.rb
 - test/stripe/invoice_test.rb
 - test/stripe/list_object_test.rb
@@ -219,6 +221,7 @@ test_files:
 - test/stripe/coupon_test.rb
 - test/stripe/customer_card_test.rb
 - test/stripe/customer_test.rb
+- test/stripe/dispute_test.rb
 - test/stripe/file_upload_test.rb
 - test/stripe/invoice_test.rb
 - test/stripe/list_object_test.rb