stripe 1.36.1 → 1.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c61dab0439a342a7b81c1891bcc86de16f1c2e2
-  data.tar.gz: d703323b3ea491f50c7b2e3af3022593a4eec0e5
+  metadata.gz: 13034f2ff5896fc11dd19069e36bb5d28c29e065
+  data.tar.gz: 8a825283ac5be6e8d30415a111b149b67418892e
 SHA512:
-  metadata.gz: 3f1b8e24a436c7aca910b09c4b39789c754a65894f5db8d9e7f3986d4f0c16eb79db4688fe5e8e1662873997cb6a867f9e6c90d4ecc983321e521ca5691fadd6
-  data.tar.gz: 32c5d898c296c3a6b41e0aad9a306d5987a4ede989d3345326856ac5130dd67751faaf97d3551a884594b22c42e05063737518651ff83d81ad2f446533f76470
+  metadata.gz: fe4c1d03c1f87740d45bf360227c7bb54305fefda51edf9d491520cfa697c04efc08a061367a77b0114a68eac63328fa48c7a94e08e4d09d699fe567abdbf71c
+  data.tar.gz: 7209dab3a89095a82b94f454232fd9772d2b3523830b87fe52ecc774b2a5cf9cda23ebf0eddaaeaac0df1a0968ae70a3f31a2153d101d1b86e3436690fef9592

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.36.2 2016-03-14
+
+* Fix reference to non-existent `#url` in `ListObject`
+
 === 1.36.1 2016-03-04
 
 * Fix serialization when subhash given to `#save` or `#update_attributes`

data/VERSION

@@ -1 +1 @@
-1.36.1
+1.36.2

data/lib/stripe/account.rb

@@ -5,7 +5,7 @@ module Stripe
     extend Stripe::APIOperations::List
     include Stripe::APIOperations::Update
 
-    def url
+    def resource_url
       if self['id']
         super
       else
@@ -25,7 +25,6 @@ module Stripe
         opts = id
         id = nil
       end
-
       super(id, opts)
     end
 
@@ -52,15 +51,16 @@ module Stripe
     #
     # We're trying to get this overturned on the server side, but for now,
     # patch in a special allowance.
-    def self.serialize_params(obj, original_value=nil)
-      update_hash = StripeObject.serialize_params(obj, original_value)
-      case obj
-      when StripeObject
-        obj_values = obj.instance_variable_get(:@values)
-        obj_values.each do |k, v|
-          if k == :additional_owners && v.is_a?(Array)
-            update_hash[k] = serialize_additional_owners(obj, v)
-          end
+    def serialize_params(options = {})
+      serialize_params_account(self, super)
+    end
+
+    def serialize_params_account(obj, update_hash)
+      if entity = @values[:legal_entity]
+        if owners = entity[:additional_owners]
+          entity_update = update_hash[:legal_entity] ||= {}
+          entity_update[:additional_owners] =
+            serialize_additional_owners(entity, owners)
         end
       end
       update_hash
@@ -89,9 +89,9 @@ module Stripe
 
     private
 
-    def self.serialize_additional_owners(obj, value)
-      original_value = obj.instance_variable_get(:@original_values)[:additional_owners]
-      if original_value && original_value.length > value.length
+    def serialize_additional_owners(legal_entity, additional_owners)
+      original_value = legal_entity.instance_variable_get(:@original_values)[:additional_owners]
+      if original_value && original_value.length > additional_owners.length
         # url params provide no mechanism for deleting an item in an array,
         # just overwriting the whole array or adding new items. So let's not
         # allow deleting without a full overwrite until we have a solution.
@@ -101,10 +101,17 @@ module Stripe
       end
 
       update_hash = {}
-      value.each_with_index do |v, i|
-        update = StripeObject.serialize_params(v)
-        if update != {} && (!original_value || update != original_value[i])
-          update_hash[i.to_s] = update
+      additional_owners.each_with_index do |v, i|
+        # We will almost always see a StripeObject except in the case of a Hash
+        # that's been appended to an array of `additional_owners`. We may be
+        # able to normalize that ugliness by using an array proxy object with
+        # StripeObjects that can detect appends and replace a hash with a
+        # StripeObject.
+        update = v.is_a?(StripeObject) ? v.serialize_params : v
+
+        if update != {} && (!original_value ||
+          update != legal_entity.serialize_params_value(original_value[i], nil, false, true))
+            update_hash[i.to_s] = update
         end
       end
       update_hash

data/lib/stripe/api_operations/create.rb

@@ -2,7 +2,7 @@ module Stripe
   module APIOperations
     module Create
       def create(params={}, opts={})
-        response, opts = request(:post, url, params, opts)
+        response, opts = request(:post, resource_url, params, opts)
         Util.convert_to_stripe_object(response, opts)
       end
     end

data/lib/stripe/api_operations/delete.rb

@@ -3,7 +3,7 @@ module Stripe
     module Delete
       def delete(params={}, opts={})
         opts = Util.normalize_opts(opts)
-        response, opts = request(:delete, url, params, opts)
+        response, opts = request(:delete, resource_url, params, opts)
         initialize_from(response, opts)
       end
     end

data/lib/stripe/api_operations/list.rb

@@ -5,7 +5,7 @@ module Stripe
         opts = Util.normalize_opts(opts)
         opts = @opts.merge(opts) if @opts
 
-        response, opts = request(:get, url, filters, opts)
+        response, opts = request(:get, resource_url, filters, opts)
         obj = ListObject.construct_from(response, opts)
 
         # set filters so that we can fetch the same limit, expansions, and

data/lib/stripe/api_operations/update.rb

@@ -14,9 +14,6 @@ module Stripe
       #   in the list, it overrides the update URL used for the create or
       #   update.
       def save(params={})
-        # Let the caller override the URL but avoid serializing it.
-        req_url = params.delete(:req_url) || save_url
-
         # We started unintentionally (sort of) allowing attributes sent to
         # +save+ to override values used during the update. So as not to break
         # the API, this makes that official here.
@@ -25,16 +22,15 @@ module Stripe
         # Now remove any parameters that look like object attributes.
         params = params.reject { |k, _| respond_to?(k) }
 
-        values = self.class.serialize_params(self).merge(params)
+        values = self.serialize_params(self).merge(params)
 
-        if values.length > 0
-          # note that id gets removed here our call to #url above has already
-          # generated a uri for this object with an identifier baked in
-          values.delete(:id)
+        # note that id gets removed here our call to #url above has already
+        # generated a uri for this object with an identifier baked in
+        values.delete(:id)
+
+        response, opts = request(:post, save_url, values)
+        initialize_from(response, opts)
 
-          response, opts = request(:post, req_url, values)
-          initialize_from(response, opts)
-        end
         self
       end
 
@@ -48,9 +44,9 @@ module Stripe
         # resource. Otherwise, generate a URL based on the object's identifier
         # for a normal update.
         if self[:id] == nil && self.class.respond_to?(:create)
-          self.class.url
+          self.class.resource_url
         else
-          url
+          resource_url
         end
       end
     end

data/lib/stripe/api_resource.rb

@@ -6,22 +6,22 @@ module Stripe
       self.name.split('::')[-1]
     end
 
-    def self.url
+    def self.resource_url
       if self == APIResource
         raise NotImplementedError.new('APIResource is an abstract class.  You should perform actions on its subclasses (Charge, Customer, etc.)')
       end
       "/v1/#{CGI.escape(class_name.downcase)}s"
     end
 
-    def url
+    def resource_url
       unless id = self['id']
         raise InvalidRequestError.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{id.inspect}", 'id')
       end
-      "#{self.class.url}/#{CGI.escape(id)}"
+      "#{self.class.resource_url}/#{CGI.escape(id)}"
     end
 
     def refresh
-      response, opts = request(:get, url, @retrieve_params)
+      response, opts = request(:get, resource_url, @retrieve_params)
       initialize_from(response, opts)
     end
 

data/lib/stripe/application_fee.rb

@@ -2,7 +2,7 @@ module Stripe
   class ApplicationFee < APIResource
     extend Stripe::APIOperations::List
 
-    def self.url
+    def self.resource_url
       '/v1/application_fees'
     end
 

data/lib/stripe/application_fee_refund.rb

@@ -3,8 +3,8 @@ module Stripe
     include Stripe::APIOperations::Update
     extend Stripe::APIOperations::List
 
-    def url
-      "#{ApplicationFee.url}/#{CGI.escape(fee)}/refunds/#{CGI.escape(id)}"
+    def resource_url
+      "#{ApplicationFee.resource_url}/#{CGI.escape(fee)}/refunds/#{CGI.escape(id)}"
     end
 
     def self.retrieve(id, api_key=nil)

data/lib/stripe/balance_transaction.rb

@@ -2,7 +2,7 @@ module Stripe
   class BalanceTransaction < APIResource
     extend Stripe::APIOperations::List
 
-    def self.url
+    def self.resource_url
       '/v1/balance/history'
     end
   end

data/lib/stripe/bank_account.rb

@@ -5,15 +5,15 @@ module Stripe
     extend Stripe::APIOperations::List
 
     def verify(params={}, opts={})
-      response, opts = request(:post, url + '/verify', params, opts)
+      response, opts = request(:post, resource_url + '/verify', params, opts)
       initialize_from(response, opts)
     end
 
-    def url
+    def resource_url
       if respond_to?(:customer)
-        "#{Customer.url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
+        "#{Customer.resource_url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
       elsif respond_to?(:account)
-        "#{Account.url}/#{CGI.escape(account)}/external_accounts/#{CGI.escape(id)}"
+        "#{Account.resource_url}/#{CGI.escape(account)}/external_accounts/#{CGI.escape(id)}"
       end
     end
 

data/lib/stripe/bitcoin_receiver.rb

@@ -5,15 +5,15 @@ module Stripe
     include Stripe::APIOperations::Delete
     extend Stripe::APIOperations::List
 
-    def self.url
+    def self.resource_url
       "/v1/bitcoin/receivers"
     end
 
-    def url
+    def resource_url
       if respond_to?(:customer) && !self.customer.nil?
-        "#{Customer.url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
+        "#{Customer.resource_url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
       else
-        "#{self.class.url}/#{CGI.escape(id)}"
+        "#{self.class.resource_url}/#{CGI.escape(id)}"
       end
     end
   end

data/lib/stripe/bitcoin_transaction.rb

@@ -2,7 +2,7 @@ module Stripe
   class BitcoinTransaction < APIResource
     extend Stripe::APIOperations::List
 
-    def self.url
+    def self.resource_url
       "/v1/bitcoin/transactions"
     end
   end

data/lib/stripe/card.rb

@@ -4,13 +4,13 @@ module Stripe
     include Stripe::APIOperations::Delete
     extend Stripe::APIOperations::List
 
-    def url
+    def resource_url
       if respond_to?(:recipient)
-        "#{Recipient.url}/#{CGI.escape(recipient)}/cards/#{CGI.escape(id)}"
+        "#{Recipient.resource_url}/#{CGI.escape(recipient)}/cards/#{CGI.escape(id)}"
       elsif respond_to?(:customer)
-        "#{Customer.url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
+        "#{Customer.resource_url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
       elsif respond_to?(:account)
-        "#{Account.url}/#{CGI.escape(account)}/external_accounts/#{CGI.escape(id)}"
+        "#{Account.resource_url}/#{CGI.escape(account)}/external_accounts/#{CGI.escape(id)}"
       end
     end
 

data/lib/stripe/charge.rb

@@ -45,7 +45,7 @@ module Stripe
       params = {
         :fraud_details => { :user_report => 'fraudulent' }
       }
-      response, opts = request(:post, url, params)
+      response, opts = request(:post, resource_url, params)
       initialize_from(response, opts)
     end
 
@@ -53,28 +53,28 @@ module Stripe
       params = {
         :fraud_details => { :user_report => 'safe' }
       }
-      response, opts = request(:post, url, params)
+      response, opts = request(:post, resource_url, params)
       initialize_from(response, opts)
     end
 
     private
 
     def capture_url
-      url + '/capture'
+      resource_url + '/capture'
     end
 
     def dispute_url
-      url + '/dispute'
+      resource_url + '/dispute'
     end
 
     def close_dispute_url
-      url + '/dispute/close'
+      resource_url + '/dispute/close'
     end
 
     # Note that this is actually the *old* refund URL and its use is no longer
     # preferred.
     def refund_url
-      url + '/refund'
+      resource_url + '/refund'
     end
   end
 end

data/lib/stripe/country_spec.rb

@@ -2,7 +2,7 @@ module Stripe
   class CountrySpec < APIResource
     extend Stripe::APIOperations::List
 
-    def self.url
+    def self.resource_url
       '/v1/country_specs'
     end
   end

data/lib/stripe/customer.rb

@@ -61,15 +61,15 @@ module Stripe
     private
 
     def discount_url
-      url + '/discount'
+      resource_url + '/discount'
     end
 
     def subscription_url
-      url + '/subscription'
+      resource_url + '/subscription'
     end
 
     def subscriptions_url
-      url + '/subscriptions'
+      resource_url + '/subscriptions'
     end
   end
 end

data/lib/stripe/dispute.rb

@@ -10,7 +10,7 @@ module Stripe
     end
 
     def close_url
-      url + '/close'
+      resource_url + '/close'
     end
   end
 end

data/lib/stripe/file_upload.rb

@@ -3,7 +3,7 @@ module Stripe
     extend Stripe::APIOperations::Create
     extend Stripe::APIOperations::List
 
-    def self.url
+    def self.resource_url
       "/v1/files"
     end
 

data/lib/stripe/invoice.rb

@@ -17,11 +17,11 @@ module Stripe
     private
 
     def self.upcoming_url
-      url + '/upcoming'
+      resource_url + '/upcoming'
     end
 
     def pay_url
-      url + '/pay'
+      resource_url + '/pay'
     end
   end
 end

data/lib/stripe/list_object.rb

@@ -64,7 +64,7 @@ module Stripe
 
     def retrieve(id, opts={})
       id, retrieve_params = Util.normalize_id(id)
-      response, opts = request(:get,"#{url}/#{CGI.escape(id)}", retrieve_params, opts)
+      response, opts = request(:get,"#{resource_url}/#{CGI.escape(id)}", retrieve_params, opts)
       Util.convert_to_stripe_object(response, opts)
     end
 
@@ -96,5 +96,10 @@ module Stripe
 
       list(params, opts)
     end
+
+    def resource_url
+      self.url ||
+        raise(ArgumentError, "List object does not contain a 'url' field.")
+    end
   end
 end

data/lib/stripe/order.rb

@@ -12,7 +12,7 @@ module Stripe
     private
 
     def pay_url
-      url + "/pay"
+      resource_url + "/pay"
     end
 
   end

data/lib/stripe/product.rb

@@ -4,14 +4,5 @@ module Stripe
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Update
     include Stripe::APIOperations::Delete
-
-    # Keep APIResource#url as `api_url` to avoid letting the external URL
-    # replace the Stripe URL.
-    alias_method :api_url, :url
-
-    # Override Stripe::APIOperations::Update#save to explicitly pass URL.
-    def save
-      super(:req_url => api_url)
-    end
   end
 end