stripe 1.18.0 → 1.19.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.19.0 2015-02-15
+
+* Support for new Transfers /reversals endpoint
+* Account retrieval now optionally accepts an account ID
+* Better support for passing custom headers, like Stripe-Account, through requests
+
 === 1.18.0 2015-01-21
 
 * 1 major enhancement:

data/VERSION

@@ -1 +1 @@
-1.18.0
+1.19.0

data/lib/stripe.rb

@@ -14,6 +14,7 @@ require 'stripe/api_operations/create'
 require 'stripe/api_operations/update'
 require 'stripe/api_operations/delete'
 require 'stripe/api_operations/list'
+require 'stripe/api_operations/request'
 
 # Resources
 require 'stripe/util'
@@ -40,6 +41,7 @@ require 'stripe/card'
 require 'stripe/subscription'
 require 'stripe/application_fee'
 require 'stripe/refund'
+require 'stripe/reversal'
 require 'stripe/application_fee_refund'
 require 'stripe/bitcoin_receiver'
 require 'stripe/bitcoin_transaction'
@@ -56,6 +58,7 @@ module Stripe
   DEFAULT_CA_BUNDLE_PATH = File.dirname(__FILE__) + '/data/ca-certificates.crt'
   @api_base = 'https://api.stripe.com'
   @connect_base = 'https://connect.stripe.com'
+  @uploads_base = 'https://uploads.stripe.com'
 
   @ssl_bundle_path  = DEFAULT_CA_BUNDLE_PATH
   @verify_ssl_certs = true
@@ -63,7 +66,7 @@ module Stripe
 
 
   class << self
-    attr_accessor :api_key, :api_base, :verify_ssl_certs, :api_version, :connect_base
+    attr_accessor :api_key, :api_base, :verify_ssl_certs, :api_version, :connect_base, :uploads_base
   end
 
   def self.api_url(url='', api_base_url=nil)
@@ -74,17 +77,17 @@ module Stripe
     api_base_url = api_base_url || @api_base
 
     unless api_key ||= @api_key
-      raise AuthenticationError.new('No API key provided. ' +
-        'Set your API key using "Stripe.api_key = <API-KEY>". ' +
-        'You can generate API keys from the Stripe web interface. ' +
-        'See https://stripe.com/api for details, or email support@stripe.com ' +
+      raise AuthenticationError.new('No API key provided. ' \
+        'Set your API key using "Stripe.api_key = <API-KEY>". ' \
+        'You can generate API keys from the Stripe web interface. ' \
+        'See https://stripe.com/api for details, or email support@stripe.com ' \
         'if you have any questions.')
     end
 
     if api_key =~ /\s/
-      raise AuthenticationError.new('Your API key is invalid, as it contains ' +
-        'whitespace. (HINT: You can double-check your API key from the ' +
-        'Stripe web interface. See https://stripe.com/api for details, or ' +
+      raise AuthenticationError.new('Your API key is invalid, as it contains ' \
+        'whitespace. (HINT: You can double-check your API key from the ' \
+        'Stripe web interface. See https://stripe.com/api for details, or ' \
         'email support@stripe.com if you have any questions.)')
     end
 
@@ -148,13 +151,13 @@ module Stripe
 
   def self.ssl_preflight_passed?
     if !verify_ssl_certs && !@no_verify
-      $stderr.puts "WARNING: Running without SSL cert verification. " +
+      $stderr.puts "WARNING: Running without SSL cert verification. " \
         "Execute 'Stripe.verify_ssl_certs = true' to enable verification."
 
       @no_verify = true
 
     elsif !Util.file_readable(@ssl_bundle_path) && !@no_bundle
-      $stderr.puts "WARNING: Running without SSL cert verification " +
+      $stderr.puts "WARNING: Running without SSL cert verification " \
         "because #{@ssl_bundle_path} isn't readable"
 
       @no_bundle = true

data/lib/stripe/account.rb

@@ -1,9 +1,35 @@
 module Stripe
-  class Account < SingletonAPIResource
+  class Account < APIResource
+    include Stripe::APIOperations::Create
+    include Stripe::APIOperations::List
+    include Stripe::APIOperations::Update
+
+    def url
+      if self['id']
+        super
+      else
+        "/v1/account"
+      end
+    end
+
+    # @override To make id optional
+    def self.retrieve(id=nil, opts={})
+      # Account used to be a singleton, where this method's signature was `(opts={})`.
+      # For the sake of not breaking folks who pass in an OAuth key in opts, let's lurkily
+      # string match for it.
+      if opts == {} && id.is_a?(String) && id.start_with?('sk_')
+        # `super` properly assumes a String opts is the apiKey and normalizes as expected.
+        opts = id
+        id = nil
+      end
+      super(id, opts)
+    end
+
     def deauthorize(client_id, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(:post, '/oauth/deauthorize', api_key, { 'client_id' => client_id, 'stripe_user_id' => self.id }, headers, Stripe.connect_base)
-      Util.convert_to_stripe_object(response, api_key)
+      opts = {:api_base => Stripe.connect_base}.merge(Util.normalize_opts(opts))
+      response, opts = request(:post, '/oauth/deauthorize', { 'client_id' => client_id, 'stripe_user_id' => self.id }, opts)
+      opts.delete(:api_base) # the api_base here is a one-off, don't persist it
+      Util.convert_to_stripe_object(response, opts)
     end
   end
 end

data/lib/stripe/api_operations/create.rb

@@ -3,9 +3,8 @@ module Stripe
     module Create
       module ClassMethods
         def create(params={}, opts={})
-          api_key, headers = Util.parse_opts(opts)
-          response, api_key = Stripe.request(:post, self.url, api_key, params, headers)
-          Util.convert_to_stripe_object(response, api_key)
+          response, opts = request(:post, url, params, opts)
+          Util.convert_to_stripe_object(response, opts)
         end
       end
 

data/lib/stripe/api_operations/delete.rb

@@ -1,10 +1,10 @@
 module Stripe
   module APIOperations
     module Delete
-      def delete(params = {}, opts={})
-        api_key, headers = Util.parse_opts(opts)
-        response, api_key = Stripe.request(:delete, url, api_key || @api_key, params, headers)
-        refresh_from(response, api_key)
+      def delete(params={}, opts={})
+        opts = Util.normalize_opts(opts)
+        response, opts = request(:delete, url, params, opts)
+        refresh_from(response, opts)
       end
     end
   end

data/lib/stripe/api_operations/list.rb

@@ -3,9 +3,9 @@ module Stripe
     module List
       module ClassMethods
         def all(filters={}, opts={})
-          api_key, headers = Util.parse_opts(opts)
-          response, api_key = Stripe.request(:get, url, api_key, filters, headers)
-          Util.convert_to_stripe_object(response, api_key)
+          opts = Util.normalize_opts(opts)
+          response, opts = request(:get, url, filters, opts)
+          Util.convert_to_stripe_object(response, opts)
         end
       end
 

data/lib/stripe/api_operations/request.rb

@@ -0,0 +1,41 @@
+module Stripe
+  module APIOperations
+    module Request
+      module ClassMethods
+        OPTS_KEYS_TO_PERSIST = Set[:api_key, :api_base, :stripe_account, :stripe_version]
+
+        def request(method, url, params={}, opts={})
+          opts = Util.normalize_opts(opts)
+
+          headers = opts.clone
+          api_key = headers.delete(:api_key)
+          api_base = headers.delete(:api_base)
+          # Assume all remaining opts must be headers
+
+          response, opts[:api_key] = Stripe.request(method, url, api_key, params, headers, api_base)
+
+          # Hash#select returns an array before 1.9
+          opts_to_persist = {}
+          opts.each do |k, v|
+            if OPTS_KEYS_TO_PERSIST.include?(k)
+              opts_to_persist[k] = v
+            end
+          end
+
+          [response, opts_to_persist]
+        end
+      end
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      protected
+
+      def request(method, url, params={}, opts={})
+        opts = @opts.merge(Util.normalize_opts(opts))
+        self.class.request(method, url, params, opts)
+      end
+    end
+  end
+end

data/lib/stripe/api_operations/update.rb

@@ -1,8 +1,8 @@
 module Stripe
   module APIOperations
     module Update
-      def save(opts={})
-        values = serialize_params(self).merge(opts)
+      def save(params={})
+        values = serialize_params(self).merge(params)
 
         if @values[:metadata]
           values[:metadata] = serialize_metadata
@@ -11,8 +11,8 @@ module Stripe
         if values.length > 0
           values.delete(:id)
 
-          response, api_key = Stripe.request(:post, url, @api_key, values)
-          refresh_from(response, api_key)
+          response, opts = request(:post, url, values)
+          refresh_from(response, opts)
         end
         self
       end

data/lib/stripe/api_resource.rb

@@ -1,5 +1,7 @@
 module Stripe
   class APIResource < StripeObject
+    include Stripe::APIOperations::Request
+
     def self.class_name
       self.name.split('::')[-1]
     end
@@ -19,12 +21,13 @@ module Stripe
     end
 
     def refresh
-      response, api_key = Stripe.request(:get, url, @api_key, @retrieve_options)
-      refresh_from(response, api_key)
+      response, opts = request(:get, url, @retrieve_params)
+      refresh_from(response, opts)
     end
 
-    def self.retrieve(id, api_key=nil)
-      instance = self.new(id, api_key)
+    def self.retrieve(id, opts=nil)
+      opts = Util.normalize_opts(opts)
+      instance = self.new(id, opts)
       instance.refresh
       instance
     end

data/lib/stripe/application_fee.rb

@@ -7,9 +7,8 @@ module Stripe
     end
 
     def refund(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(:post, refund_url, api_key || @api_key, params, headers)
-      refresh_from(response, api_key)
+      response, opts = request(:post, refund_url, params, opts)
+      refresh_from(response, opts)
     end
 
     private

data/lib/stripe/card.rb

@@ -12,7 +12,7 @@ module Stripe
       end
     end
 
-    def self.retrieve(id, api_key=nil)
+    def self.retrieve(id, opts=nil)
       raise NotImplementedError.new("Cards cannot be retrieved without a customer ID. Retrieve a card using customer.cards.retrieve('card_id')")
     end
   end

data/lib/stripe/certificate_blacklist.rb

@@ -39,9 +39,9 @@ module Stripe
       if blacklisted_certs = BLACKLIST[uri.host]
         if blacklisted_certs.include?(fingerprint)
           raise APIConnectionError.new(
-            "Invalid server certificate. You tried to connect to a server that" +
-            "has a revoked SSL certificate, which means we cannot securely send" +
-            "data to that server. Please email support@stripe.com if you need" +
+            "Invalid server certificate. You tried to connect to a server that" \
+            "has a revoked SSL certificate, which means we cannot securely send" \
+            "data to that server. Please email support@stripe.com if you need" \
             "help connecting to the correct API server."
           )
         end

data/lib/stripe/charge.rb

@@ -5,48 +5,40 @@ module Stripe
     include Stripe::APIOperations::Update
 
     def refund(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :post, refund_url, api_key || @api_key, params, headers)
-      refresh_from(response, api_key)
+      response, opts = request(:post, refund_url, params, opts)
+      refresh_from(response, opts)
     end
 
     def capture(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :post, capture_url, api_key || @api_key, params, headers)
-      refresh_from(response, api_key)
+      response, opts = request(:post, capture_url, params, opts)
+      refresh_from(response, opts)
     end
 
     def update_dispute(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :post, dispute_url, api_key || @api_key, params, headers)
-      refresh_from({ :dispute => response }, api_key, true)
+      response, opts = request(:post, dispute_url, params, opts)
+      refresh_from({ :dispute => response }, opts, true)
       dispute
     end
 
     def close_dispute(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :post, close_dispute_url, api_key || @api_key, params, headers)
-      refresh_from(response, api_key)
+      response, opts = request(:post, close_dispute_url, params, opts)
+      refresh_from(response, opts)
     end
 
     def mark_as_fraudulent
       params = {
         :fraud_details => { :user_report => 'fraudulent' }
       }
-      response, api_key = Stripe.request(:post, url, @api_key, params)
-      refresh_from(response, api_key)
+      response, opts = request(:post, url, params)
+      refresh_from(response, opts)
     end
 
     def mark_as_safe
       params = {
         :fraud_details => { :user_report => 'safe' }
       }
-      response, api_key = Stripe.request(:post, url, @api_key, params)
-      refresh_from(response, api_key)
+      response, opts = request(:post, url, params)
+      refresh_from(response, opts)
     end
 
     private

data/lib/stripe/customer.rb

@@ -6,58 +6,52 @@ module Stripe
     include Stripe::APIOperations::List
 
     def add_invoice_item(params, opts={})
-      opts[:api_key] = @api_key
+      opts = @opts.merge(Util.normalize_opts(opts))
       InvoiceItem.create(params.merge(:customer => id), opts)
     end
 
     def invoices
-      Invoice.all({ :customer => id }, @api_key)
+      Invoice.all({ :customer => id }, @opts)
     end
 
     def invoice_items
-      InvoiceItem.all({ :customer => id }, @api_key)
+      InvoiceItem.all({ :customer => id }, @opts)
     end
 
     def upcoming_invoice
-      Invoice.upcoming({ :customer => id }, @api_key)
+      Invoice.upcoming({ :customer => id }, @opts)
     end
 
     def charges
-      Charge.all({ :customer => id }, @api_key)
+      Charge.all({ :customer => id }, @opts)
     end
 
     def create_upcoming_invoice(params={}, opts={})
-      opts[:api_key] = @api_key
+      opts = @opts.merge(Util.normalize_opts(opts))
       Invoice.create(params.merge(:customer => id), opts)
     end
 
     def cancel_subscription(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :delete, subscription_url, api_key || @api_key, params, headers)
-      refresh_from({ :subscription => response }, api_key, true)
+      response, opts = request(:delete, subscription_url, params, opts)
+      refresh_from({ :subscription => response }, opts, true)
       subscription
     end
 
     def update_subscription(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :post, subscription_url, api_key  || @api_key, params, headers)
-      refresh_from({ :subscription => response }, api_key, true)
+      response, opts = request(:post, subscription_url, params, opts)
+      refresh_from({ :subscription => response }, opts, true)
       subscription
     end
 
     def create_subscription(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :post, subscriptions_url, api_key || @api_key, params, headers)
-      refresh_from({ :subscription => response }, api_key, true)
+      response, opts = request(:post, subscriptions_url, params, opts)
+      refresh_from({ :subscription => response }, opts, true)
       subscription
     end
 
     def delete_discount
-      Stripe.request(:delete, discount_url, @api_key)
-      refresh_from({ :discount => nil }, api_key, true)
+      _, opts = request(:delete, discount_url)
+      refresh_from({ :discount => nil }, opts, true)
     end
 
     private

data/lib/stripe/file_upload.rb

@@ -1,34 +1,22 @@
 module Stripe
   class FileUpload < APIResource
-    UPLOADS_API_BASE = "https://uploads.stripe.com"
-
     def self.url
       "/v1/files"
     end
 
-    def self.request_headers
-      {
+    def self.create(params={}, opts={})
+      opts = {
         :content_type => 'multipart/form-data',
-      }
-    end
-
-    def self.create(params={}, api_key=nil)
-      response, api_key = Stripe.request(
-        :post, self.url, api_key, params, self.request_headers, UPLOADS_API_BASE)
-      Util.convert_to_stripe_object(response, api_key)
+        :api_base => Stripe::uploads_base
+      }.merge(opts)
+      response, opts = request(:post, url, params, opts)
+      Util.convert_to_stripe_object(response, opts)
     end
 
     def self.all(filters={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      response, api_key = Stripe.request(
-        :get, self.url, api_key, filters, headers, UPLOADS_API_BASE)
-      Util.convert_to_stripe_object(response, api_key)
-    end
-
-    def refresh
-      response, api_key = Stripe.request(
-        :get, url, @api_key, @retrieve_options, self.class.request_headers, UPLOADS_API_BASE)
-      refresh_from(response, api_key)
+      opts = {:api_base => Stripe::uploads_base}.merge(opts)
+      response, opts = request(:get, url, filters, opts)
+      Util.convert_to_stripe_object(response, opts)
     end
   end
 end

data/lib/stripe/invoice.rb

@@ -4,14 +4,15 @@ module Stripe
     include Stripe::APIOperations::Update
     include Stripe::APIOperations::Create
 
-    def self.upcoming(params, api_key = nil)
-      response, api_key = Stripe.request(:get, upcoming_url, api_key, params)
-      Util.convert_to_stripe_object(response, api_key)
+    def self.upcoming(params, opts={})
+      opts = Util.normalize_opts(opts)
+      response, api_key = Stripe.request(:get, upcoming_url, opts, params)
+      Util.convert_to_stripe_object(response, opts)
     end
 
     def pay
-      response, api_key = Stripe.request(:post, pay_url, @api_key)
-      refresh_from(response, api_key)
+      response, opts = Stripe.request(:post, pay_url, @opts, {})
+      refresh_from(response, opts)
     end
 
     private

data/lib/stripe/list_object.rb

@@ -1,5 +1,6 @@
 module Stripe
   class ListObject < StripeObject
+    include Stripe::APIOperations::Request
 
     def [](k)
       case k
@@ -14,24 +15,19 @@ module Stripe
       self.data.each(&blk)
     end
 
-    def retrieve(id, api_key=nil)
-      api_key ||= @api_key
-      response, api_key = Stripe.request(:get,"#{url}/#{CGI.escape(id)}", api_key)
-      Util.convert_to_stripe_object(response, api_key)
+    def retrieve(id, opts={})
+      response, opts = request(:get,"#{url}/#{CGI.escape(id)}", {}, opts)
+      Util.convert_to_stripe_object(response, opts)
     end
 
     def create(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      api_key ||= @api_key
-      response, api_key = Stripe.request(:post, url, api_key, params, headers)
-      Util.convert_to_stripe_object(response, api_key)
+      response, opts = request(:post, url, params, opts)
+      Util.convert_to_stripe_object(response, opts)
     end
 
     def all(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      api_key ||= @api_key
-      response, api_key = Stripe.request(:get, url, api_key, params, headers)
-      Util.convert_to_stripe_object(response, api_key)
+      response, opts = request(:get, url, params, opts)
+      Util.convert_to_stripe_object(response, opts)
     end
   end
 end

data/lib/stripe/reversal.rb

@@ -0,0 +1,14 @@
+module Stripe
+  class Reversal < APIResource
+    include Stripe::APIOperations::Update
+    include Stripe::APIOperations::List
+
+    def url
+      "#{Transfer.url}/#{CGI.escape(transfer)}/reversals/#{CGI.escape(id)}"
+    end
+
+    def self.retrieve(id, opts={})
+      raise NotImplementedError.new("Reversals cannot be retrieved without a transfer ID. Retrieve a reversal using transfer.reversals.retrieve('reversal_id')")
+    end
+  end
+end

data/lib/stripe/stripe_object.rb

@@ -2,25 +2,24 @@ module Stripe
   class StripeObject
     include Enumerable
 
-    attr_accessor :api_key
-    @@permanent_attributes = Set.new([:api_key, :id])
+    @@permanent_attributes = Set.new([:id])
 
     # The default :id method is deprecated and isn't useful to us
     if method_defined?(:id)
       undef :id
     end
 
-    def initialize(id=nil, api_key=nil)
+    def initialize(id=nil, opts={})
       # parameter overloading!
       if id.kind_of?(Hash)
-        @retrieve_options = id.dup
-        @retrieve_options.delete(:id)
+        @retrieve_params = id.dup
+        @retrieve_params.delete(:id)
         id = id[:id]
       else
-        @retrieve_options = {}
+        @retrieve_params = {}
       end
 
-      @api_key = api_key
+      @opts = opts
       @values = {}
       # This really belongs in APIResource, but not putting it there allows us
       # to have a unified inspect method
@@ -29,8 +28,8 @@ module Stripe
       @values[:id] = id if id
     end
 
-    def self.construct_from(values, api_key=nil)
-      self.new(values[:id], api_key).refresh_from(values, api_key)
+    def self.construct_from(values, opts={})
+      self.new(values[:id]).refresh_from(values, opts)
     end
 
     def to_s(*args)
@@ -42,9 +41,8 @@ module Stripe
       "#<#{self.class}:0x#{self.object_id.to_s(16)}#{id_string}> JSON: " + JSON.pretty_generate(@values)
     end
 
-    def refresh_from(values, api_key, partial=false)
-      @api_key = api_key
-
+    def refresh_from(values, opts, partial=false)
+      @opts = opts
       @previous_metadata = values[:metadata]
       removed = partial ? Set.new : Set.new(@values.keys - values.keys)
       added = Set.new(values.keys - @values.keys)
@@ -62,7 +60,7 @@ module Stripe
         @unsaved_values.delete(k)
       end
       values.each do |k, v|
-        @values[k] = Util.convert_to_stripe_object(v, api_key)
+        @values[k] = Util.convert_to_stripe_object(v, @opts)
         @transient_values.delete(k)
         @unsaved_values.delete(k)
       end
@@ -106,12 +104,12 @@ module Stripe
     end
 
     def _dump(level)
-      Marshal.dump([@values, @api_key])
+      Marshal.dump([@values, @opts])
     end
 
     def self._load(args)
-      values, api_key = Marshal.load(args)
-      construct_from(values, api_key)
+      values, opts = Marshal.load(args)
+      construct_from(values, opts)
     end
 
     if RUBY_VERSION < '1.9.2'
@@ -146,8 +144,8 @@ module Stripe
           define_method(k_eq) do |v|
             if v == ""
               raise ArgumentError.new(
-                "You cannot set #{k} to an empty string." +
-                "We interpret empty strings as nil in requests." +
+                "You cannot set #{k} to an empty string." \
+                "We interpret empty strings as nil in requests." \
                 "You may set #{self}.#{k} = nil to delete the property.")
             end
             @values[k] = v

data/lib/stripe/subscription.rb

@@ -7,13 +7,13 @@ module Stripe
       "#{Customer.url}/#{CGI.escape(customer)}/subscriptions/#{CGI.escape(id)}"
     end
 
-    def self.retrieve(id, api_key=nil)
+    def self.retrieve(id, opts=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)
+      response, opts = request(:delete, discount_url)
+      refresh_from({ :discount => nil }, opts, true)
     end
 
     private

data/lib/stripe/util.rb

@@ -21,6 +21,7 @@ module Stripe
         'list' => ListObject,
 
         # business objects
+        'account' => Account,
         'application_fee' => ApplicationFee,
         'balance' => Balance,
         'balance_transaction' => BalanceTransaction,
@@ -38,18 +39,19 @@ module Stripe
         'subscription' => Subscription,
         'file_upload' => FileUpload,
         'transfer' => Transfer,
+        'transfer_reversal' => Reversal,
         'bitcoin_receiver' => BitcoinReceiver,
         'bitcoin_transaction' => BitcoinTransaction
       }
     end
 
-    def self.convert_to_stripe_object(resp, api_key)
+    def self.convert_to_stripe_object(resp, opts)
       case resp
       when Array
-        resp.map { |i| convert_to_stripe_object(i, api_key) }
+        resp.map { |i| convert_to_stripe_object(i, opts) }
       when Hash
         # Try converting to a known object class.  If none available, fall back to generic StripeObject
-        object_classes.fetch(resp[:object], StripeObject).construct_from(resp, api_key)
+        object_classes.fetch(resp[:object], StripeObject).construct_from(resp, opts)
       else
         resp
       end
@@ -119,23 +121,16 @@ module Stripe
 
     # 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.parse_opts(opts)
+    def self.normalize_opts(opts)
       case opts
       when NilClass
-        return nil, {}
+        {}
       when String
-        return opts, {}
+        {:api_key => opts}
       when Hash
-        headers = {}
-        if opts[:idempotency_key]
-          headers[:idempotency_key] = opts[:idempotency_key]
-        end
-        if opts[:stripe_account]
-          headers[:stripe_account] = opts[:stripe_account]
-        end
-        return opts[:api_key], headers
+        opts.clone
       else
-        raise TypeError.new("parse_opts expects a string or a hash")
+        raise TypeError.new('normalize_opts expects a string or a hash')
       end
     end
   end

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.18.0'
+  VERSION = '1.19.0'
 end

data/stripe.gemspec

@@ -20,7 +20,6 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('shoulda', '~> 3.4.0')
   s.add_development_dependency('test-unit')
   s.add_development_dependency('rake')
-  s.add_development_dependency('pry')
 
   s.files = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/test/stripe/account_test.rb

@@ -4,13 +4,28 @@ module Stripe
   class AccountTest < Test::Unit::TestCase
     should "account should be retrievable" do
       resp = {:email => "test+bindings@stripe.com", :charge_enabled => false, :details_submitted => false}
-      @mock.expects(:get).once.returns(test_response(resp))
+      @mock.expects(:get).
+        once.
+        with('https://api.stripe.com/v1/account', nil, nil).
+        returns(test_response(resp))
       a = Stripe::Account.retrieve
       assert_equal "test+bindings@stripe.com", a.email
       assert !a.charge_enabled
       assert !a.details_submitted
     end
 
+    should "account should be retrievable via plural endpoint" do
+      resp = {:email => "test+bindings@stripe.com", :charge_enabled => false, :details_submitted => false}
+      @mock.expects(:get).
+        once.
+        with('https://api.stripe.com/v1/accounts/acct_foo', nil, nil).
+        returns(test_response(resp))
+      a = Stripe::Account.retrieve('acct_foo')
+      assert_equal "test+bindings@stripe.com", a.email
+      assert !a.charge_enabled
+      assert !a.details_submitted
+    end
+
     should "be able to deauthorize an account" do
       resp = {:id => 'acct_1234', :email => "test+bindings@stripe.com", :charge_enabled => false, :details_submitted => false}
       @mock.expects(:get).once.returns(test_response(resp))

data/test/stripe/api_resource_test.rb

@@ -67,6 +67,23 @@ module Stripe
       end
     end
 
+    should "send expand on fetch properly" do
+      @mock.expects(:get).once.
+        with("#{Stripe.api_base}/v1/charges/ch_test_charge?expand[]=customer", nil, nil).
+        returns(test_response(test_charge))
+
+      Stripe::Charge.retrieve({:id => 'ch_test_charge', :expand => [:customer]})
+    end
+
+    should "preserve expand across refreshes" do
+      @mock.expects(:get).twice.
+        with("#{Stripe.api_base}/v1/charges/ch_test_charge?expand[]=customer", nil, nil).
+        returns(test_response(test_charge))
+
+      ch = Stripe::Charge.retrieve({:id => 'ch_test_charge', :expand => [:customer]})
+      ch.refresh
+    end
+
     should "send stripe account as header when set" do
       stripe_account = "acct_0000"
       Stripe.expects(:execute_request).with do |opts|
@@ -294,7 +311,6 @@ module Stripe
         @mock.expects(:get).never
         @mock.expects(:post).never
         @mock.expects(:delete).with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).once.returns(test_response({ "id" => "test_customer", "deleted" => true }))
-
         c = Stripe::Customer.construct_from(test_customer)
         c.delete
         assert_equal true, c.deleted
@@ -318,6 +334,33 @@ module Stripe
         assert c[0].card.kind_of?(Stripe::StripeObject) && c[0].card.object == 'card'
       end
 
+      should "passing in a stripe_account header should pass it through on call" do
+        Stripe.expects(:execute_request).with do |opts|
+          opts[:method] == :get &&
+          opts[:url] == "#{Stripe.api_base}/v1/customers/c_test_customer" &&
+          opts[:headers][:stripe_account] == 'acct_abc'
+        end.once.returns(test_response(test_customer))
+        c = 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
+        Stripe.expects(:execute_request).with do |opts|
+          opts[:method] == :get &&
+          opts[:url] == "#{Stripe.api_base}/v1/customers/c_test_customer" &&
+          opts[:headers][:stripe_account] == 'acct_abc'
+        end.once.returns(test_response(test_customer))
+        c = Stripe::Customer.retrieve("c_test_customer", {:stripe_account => 'acct_abc'})
+
+        Stripe.expects(:execute_request).with do |opts|
+          opts[:method] == :post &&
+          opts[:url] == "#{Stripe.api_base}/v1/customers/c_test_customer" &&
+          opts[:headers][:stripe_account] == 'acct_abc' &&
+          opts[:payload] == 'description=FOO'
+        end.once.returns(test_response(test_customer))
+        c.description = 'FOO'
+        c.save
+      end
+
       context "error checking" do
 
         should "404s should raise an InvalidRequestError" do

data/test/stripe/reversal_test.rb

@@ -0,0 +1,47 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Stripe
+  class ReversalTest < Test::Unit::TestCase
+    should "reversals should be listable" do
+      @mock.expects(:get).once.returns(test_response(test_transfer))
+
+      transfer = Stripe::Transfer.retrieve('test_transfer')
+
+      assert transfer.reversals.first.kind_of?(Stripe::Reversal)
+    end
+
+    should "reversals should be refreshable" do
+      @mock.expects(:get).twice.returns(test_response(test_transfer), test_response(test_reversal(:id => 'refreshed_reversal')))
+
+      transfer = Stripe::Transfer.retrieve('test_transfer')
+      reversal = transfer.reversals.first
+      reversal.refresh
+
+      assert_equal 'refreshed_reversal', reversal.id
+    end
+
+    should "reversals should be updateable" do
+      @mock.expects(:get).once.returns(test_response(test_transfer))
+      @mock.expects(:post).once.returns(test_response(test_reversal(:metadata => {'key' => 'value'})))
+
+      transfer = Stripe::Transfer.retrieve('test_transfer')
+      reversal = transfer.reversals.first
+
+      assert_equal nil, reversal.metadata['key']
+
+      reversal.metadata['key'] = 'value'
+      reversal.save
+
+      assert_equal 'value', reversal.metadata['key']
+    end
+
+    should "create should return a new reversal" do
+      @mock.expects(:get).once.returns(test_response(test_transfer))
+      @mock.expects(:post).once.returns(test_response(test_reversal(:id => 'test_new_reversal')))
+
+      transfer = Stripe::Transfer.retrieve('test_transfer')
+      reversals = transfer.reversals.create(:amount => 20)
+      assert_equal 'test_new_reversal', reversals.id
+    end
+  end
+end

data/test/stripe/stripe_object_test.rb

@@ -10,11 +10,12 @@ module Stripe
     end
 
     should "marshal a stripe object correctly" do
-      obj = Stripe::StripeObject.construct_from({ :id => 1, :name => 'Stripe' }, 'apikey')
+      obj = Stripe::StripeObject.construct_from({ :id => 1, :name => 'Stripe' }, {:api_key => 'apikey'})
       m = Marshal.load(Marshal.dump(obj))
       assert_equal 1, m.id
       assert_equal 'Stripe', m.name
-      assert_equal 'apikey', m.api_key
+      expected_hash = {:api_key => 'apikey'}
+      assert_equal expected_hash, m.instance_variable_get('@opts')
     end
 
     should "recursively call to_hash on its values" do

data/test/stripe/util_test.rb

@@ -25,35 +25,5 @@ module Stripe
       symbolized = Stripe::Util.symbolize_names(start)
       assert_equal(finish, symbolized)
     end
-
-    should "parse a nil opts argument" do
-      api_key, headers = Stripe::Util.parse_opts(nil)
-      assert_equal({}, headers)
-      assert_equal(nil, api_key)
-    end
-
-    should "parse a string opts argument" do
-      api_key, headers = Stripe::Util.parse_opts('foo')
-      assert_equal({}, headers)
-      assert_equal('foo', api_key)
-    end
-
-    should "parse a hash opts argument with just api_key" do
-      api_key, headers = Stripe::Util.parse_opts({:api_key => 'foo'})
-      assert_equal({}, headers)
-      assert_equal('foo', api_key)
-    end
-
-    should "parse a hash opts argument with just idempotency_key" do
-      api_key, headers = Stripe::Util.parse_opts({:idempotency_key => 'foo'})
-      assert_equal({:idempotency_key => 'foo'}, headers)
-      assert_equal(nil, api_key)
-    end
-
-    should "parse a hash opts argument both idempotency_key and api_key" do
-      api_key, headers = Stripe::Util.parse_opts({:api_key => 'bar', :idempotency_key => 'foo'})
-      assert_equal({:idempotency_key => 'foo'}, headers)
-      assert_equal('bar', api_key)
-    end
   end
 end

data/test/test_data.rb

@@ -254,6 +254,13 @@ module Stripe
       }
     end
 
+    def test_reversal_array(transfer_id)
+      {
+        :data => [test_reversal, test_reversal, test_reversal],
+        :object => 'list',
+        :url => '/v1/transfers/' + transfer_id + '/reversals'
+      }
+    end
 
     def test_invoice
       {
@@ -359,6 +366,7 @@ module Stripe
         :fee => 0,
         :fee_details => [],
         :id => "tr_test_transfer",
+        :reversals => test_reversal_array('tr_test_transfer'),
         :livemode => false,
         :currency => "usd",
         :object => "transfer",
@@ -381,6 +389,18 @@ module Stripe
       })
     end
 
+    def test_reversal(params={})
+      {
+        :object => 'transfer_reversal',
+        :amount => 30,
+        :currency => "usd",
+        :created => 1308595038,
+        :id => "ref_test_reversal",
+        :transfer => "tr_test_transfer",
+        :metadata => {}
+      }.merge(params)
+    end
+
     def test_bitcoin_receiver(params={})
       {
         :id => 'btcrcv_test_receiver',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -130,22 +130,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Stripe is the easiest way to accept payments online.  See https://stripe.com
   for details.
 email:
@@ -175,6 +159,7 @@ files:
 - lib/stripe/api_operations/create.rb
 - lib/stripe/api_operations/delete.rb
 - lib/stripe/api_operations/list.rb
+- lib/stripe/api_operations/request.rb
 - lib/stripe/api_operations/update.rb
 - lib/stripe/api_resource.rb
 - lib/stripe/application_fee.rb
@@ -202,6 +187,7 @@ files:
 - lib/stripe/plan.rb
 - lib/stripe/recipient.rb
 - lib/stripe/refund.rb
+- lib/stripe/reversal.rb
 - lib/stripe/singleton_api_resource.rb
 - lib/stripe/stripe_object.rb
 - lib/stripe/subscription.rb
@@ -226,6 +212,7 @@ files:
 - test/stripe/metadata_test.rb
 - test/stripe/recipient_card_test.rb
 - test/stripe/refund_test.rb
+- test/stripe/reversal_test.rb
 - test/stripe/stripe_object_test.rb
 - test/stripe/subscription_test.rb
 - test/stripe/transfer_test.rb
@@ -274,6 +261,7 @@ test_files:
 - test/stripe/metadata_test.rb
 - test/stripe/recipient_card_test.rb
 - test/stripe/refund_test.rb
+- test/stripe/reversal_test.rb
 - test/stripe/stripe_object_test.rb
 - test/stripe/subscription_test.rb
 - test/stripe/transfer_test.rb