stripe 3.3.2 → 3.4.1

data/lib/stripe/country_spec.rb

@@ -2,10 +2,10 @@ module Stripe
   class CountrySpec < APIResource
     extend Stripe::APIOperations::List
 
-    OBJECT_NAME = 'country_spec'
+    OBJECT_NAME = "country_spec".freeze
 
     def self.resource_url
-      '/v1/country_specs'
+      "/v1/country_specs"
     end
   end
 end

data/lib/stripe/coupon.rb

@@ -5,6 +5,6 @@ module Stripe
     include Stripe::APIOperations::Delete
     extend Stripe::APIOperations::List
 
-    OBJECT_NAME = 'coupon'
+    OBJECT_NAME = "coupon".freeze
   end
 end

data/lib/stripe/customer.rb

@@ -5,75 +5,75 @@ module Stripe
     include Stripe::APIOperations::Save
     extend Stripe::APIOperations::List
 
-    OBJECT_NAME = 'customer'
+    OBJECT_NAME = "customer".freeze
 
     save_nested_resource :source
 
-    def add_invoice_item(params, opts={})
+    def add_invoice_item(params, opts = {})
       opts = @opts.merge(Util.normalize_opts(opts))
-      InvoiceItem.create(params.merge(:customer => id), opts)
+      InvoiceItem.create(params.merge(customer: id), opts)
     end
 
-    def invoices(params={}, opts={})
+    def invoices(params = {}, opts = {})
       opts = @opts.merge(Util.normalize_opts(opts))
-      Invoice.all(params.merge(:customer => id), opts)
+      Invoice.all(params.merge(customer: id), opts)
     end
 
-    def invoice_items(params={}, opts={})
+    def invoice_items(params = {}, opts = {})
       opts = @opts.merge(Util.normalize_opts(opts))
-      InvoiceItem.all(params.merge(:customer => id), opts)
+      InvoiceItem.all(params.merge(customer: id), opts)
     end
 
-    def upcoming_invoice(params={}, opts={})
+    def upcoming_invoice(params = {}, opts = {})
       opts = @opts.merge(Util.normalize_opts(opts))
-      Invoice.upcoming(params.merge(:customer => id), opts)
+      Invoice.upcoming(params.merge(customer: id), opts)
     end
 
-    def charges(params={}, opts={})
+    def charges(params = {}, opts = {})
       opts = @opts.merge(Util.normalize_opts(opts))
-      Charge.all(params.merge(:customer => id), opts)
+      Charge.all(params.merge(customer: id), opts)
     end
 
-    def create_upcoming_invoice(params={}, opts={})
+    def create_upcoming_invoice(params = {}, opts = {})
       opts = @opts.merge(Util.normalize_opts(opts))
-      Invoice.create(params.merge(:customer => id), opts)
+      Invoice.create(params.merge(customer: id), opts)
     end
 
-    def cancel_subscription(params={}, opts={})
+    def cancel_subscription(params = {}, opts = {})
       resp, opts = request(:delete, subscription_url, params, opts)
-      initialize_from({ :subscription => resp.data }, opts, true)
+      initialize_from({ subscription: resp.data }, opts, true)
       subscription
     end
 
-    def update_subscription(params={}, opts={})
+    def update_subscription(params = {}, opts = {})
       resp, opts = request(:post, subscription_url, params, opts)
-      initialize_from({ :subscription => resp.data }, opts, true)
+      initialize_from({ subscription: resp.data }, opts, true)
       subscription
     end
 
-    def create_subscription(params={}, opts={})
+    def create_subscription(params = {}, opts = {})
       resp, opts = request(:post, subscriptions_url, params, opts)
-      initialize_from({ :subscription => resp.data }, opts, true)
+      initialize_from({ subscription: resp.data }, opts, true)
       subscription
     end
 
     def delete_discount
       _, opts = request(:delete, discount_url)
-      initialize_from({ :discount => nil }, opts, true)
+      initialize_from({ discount: nil }, opts, true)
     end
 
     private
 
     def discount_url
-      resource_url + '/discount'
+      resource_url + "/discount"
     end
 
     def subscription_url
-      resource_url + '/subscription'
+      resource_url + "/subscription"
     end
 
     def subscriptions_url
-      resource_url + '/subscriptions'
+      resource_url + "/subscriptions"
     end
   end
 end

data/lib/stripe/dispute.rb

@@ -3,15 +3,15 @@ module Stripe
     extend Stripe::APIOperations::List
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'dispute'
+    OBJECT_NAME = "dispute".freeze
 
-    def close(params={}, opts={})
+    def close(params = {}, opts = {})
       resp, opts = request(:post, close_url, params, opts)
       initialize_from(resp.data, opts)
     end
 
     def close_url
-      resource_url + '/close'
+      resource_url + "/close"
     end
   end
 end

data/lib/stripe/ephemeral_key.rb

@@ -3,15 +3,15 @@ module Stripe
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Delete
 
-    OBJECT_NAME = 'ephemeral_key'
+    OBJECT_NAME = "ephemeral_key".freeze
 
     def self.resource_url
-      '/v1/ephemeral_keys'
+      "/v1/ephemeral_keys"
     end
 
-    def self.create(params={}, opts={})
+    def self.create(params = {}, opts = {})
       opts = Util.normalize_opts(opts)
-      raise ArgumentError.new('stripe_version must be specified to create an ephemeral key') if !opts[:stripe_version]
+      raise ArgumentError, "stripe_version must be specified to create an ephemeral key" unless opts[:stripe_version]
       super
     end
   end

data/lib/stripe/errors.rb

@@ -17,7 +17,7 @@ module Stripe
     attr_reader :request_id
 
     # Initializes a StripeError.
-    def initialize(message=nil, http_status: nil, http_body: nil, json_body: nil,
+    def initialize(message = nil, http_status: nil, http_body: nil, json_body: nil,
                    http_headers: nil)
       @message = message
       @http_status = http_status
@@ -60,7 +60,7 @@ module Stripe
     def initialize(message, param, code, http_status: nil, http_body: nil, json_body: nil,
                    http_headers: nil)
       super(message, http_status: http_status, http_body: http_body,
-        json_body: json_body, http_headers: http_headers)
+                     json_body: json_body, http_headers: http_headers)
       @param = param
       @code = code
     end
@@ -74,7 +74,7 @@ module Stripe
     def initialize(message, param, http_status: nil, http_body: nil, json_body: nil,
                    http_headers: nil)
       super(message, http_status: http_status, http_body: http_body,
-        json_body: json_body, http_headers: http_headers)
+                     json_body: json_body, http_headers: http_headers)
       @param = param
     end
   end
@@ -109,7 +109,7 @@ module Stripe
       def initialize(code, description, http_status: nil, http_body: nil, json_body: nil,
                      http_headers: nil)
         super(description, http_status: http_status, http_body: http_body,
-          json_body: json_body, http_headers: http_headers)
+                           json_body: json_body, http_headers: http_headers)
         @code = code
       end
     end

data/lib/stripe/event.rb

@@ -2,6 +2,6 @@ module Stripe
   class Event < APIResource
     extend Stripe::APIOperations::List
 
-    OBJECT_NAME = 'event'
+    OBJECT_NAME = "event".freeze
   end
 end

data/lib/stripe/file_upload.rb

@@ -3,20 +3,20 @@ module Stripe
     extend Stripe::APIOperations::Create
     extend Stripe::APIOperations::List
 
-    OBJECT_NAME = 'file_upload'
+    OBJECT_NAME = "file_upload".freeze
 
     def self.resource_url
       "/v1/files"
     end
 
-    def self.request(method, url, params={}, opts={})
+    def self.request(method, url, params = {}, opts = {})
       opts = {
-        :api_base => Stripe::uploads_base
+        api_base: Stripe.uploads_base,
       }.merge(Util.normalize_opts(opts))
       super
     end
 
-    def self.create(params={}, opts={})
+    def self.create(params = {}, opts = {})
       # rest-client would accept a vanilla `File` for upload, but Faraday does
       # not. Support the old API by wrapping a `File` with an `UploadIO` object
       # if we're given one.
@@ -25,7 +25,7 @@ module Stripe
       end
 
       opts = {
-        :content_type => 'multipart/form-data',
+        content_type: "multipart/form-data",
       }.merge(Util.normalize_opts(opts))
       super
     end

data/lib/stripe/invoice.rb

@@ -4,26 +4,26 @@ module Stripe
     include Stripe::APIOperations::Save
     extend Stripe::APIOperations::Create
 
-    OBJECT_NAME = 'invoice'
+    OBJECT_NAME = "invoice".freeze
 
-    def self.upcoming(params, opts={})
+    def self.upcoming(params, opts = {})
       resp, opts = request(:get, upcoming_url, params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end
 
-    def pay(params={}, opts={})
+    def pay(params = {}, opts = {})
       resp, opts = request(:post, pay_url, params, opts)
       initialize_from(resp.data, opts)
     end
 
-    private
-
     def self.upcoming_url
-      resource_url + '/upcoming'
+      resource_url + "/upcoming"
     end
+    private_class_method :upcoming_url
 
     def pay_url
-      resource_url + '/pay'
+      resource_url + "/pay"
     end
+    private :pay_url
   end
 end

data/lib/stripe/invoice_item.rb

@@ -5,6 +5,6 @@ module Stripe
     include Stripe::APIOperations::Delete
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'invoiceitem'
+    OBJECT_NAME = "invoiceitem".freeze
   end
 end

data/lib/stripe/invoice_line_item.rb

@@ -1,5 +1,5 @@
 module Stripe
   class InvoiceLineItem < StripeObject
-    OBJECT_NAME = 'line_item'
+    OBJECT_NAME = "line_item".freeze
   end
 end

data/lib/stripe/list_object.rb

@@ -5,7 +5,7 @@ module Stripe
     include Stripe::APIOperations::Request
     include Stripe::APIOperations::Create
 
-    OBJECT_NAME = 'list'
+    OBJECT_NAME = "list".freeze
 
     # This accessor allows a `ListObject` to inherit various filters that were
     # given to a predecessor. This allows for things like consistent limits,
@@ -15,8 +15,8 @@ module Stripe
     # An empty list object. This is returned from +next+ when we know that
     # there isn't a next page in order to replicate the behavior of the API
     # when it attempts to return a page beyond the last.
-    def self.empty_list(opts={})
-      ListObject.construct_from({ :data => [] }, opts)
+    def self.empty_list(opts = {})
+      ListObject.construct_from({ data: [] }, opts)
     end
 
     def initialize(*args)
@@ -29,7 +29,7 @@ module Stripe
       when String, Symbol
         super
       else
-        raise ArgumentError.new("You tried to access the #{k.inspect} index, but ListObject types only support String keys. (HINT: List calls return an object with a 'data' (which is the data array). You likely want to call #data[#{k.inspect}])")
+        raise ArgumentError, "You tried to access the #{k.inspect} index, but ListObject types only support String keys. (HINT: List calls return an object with a 'data' (which is the data array). You likely want to call #data[#{k.inspect}])"
       end
     end
 
@@ -39,7 +39,7 @@ module Stripe
     # Note that this method makes no effort to fetch a new page when it gets to
     # the end of the current page's resources. See also +auto_paging_each+.
     def each(&blk)
-      self.data.each(&blk)
+      data.each(&blk)
     end
 
     # Iterates through each resource in all pages, making additional fetches to
@@ -61,12 +61,12 @@ module Stripe
 
     # Returns true if the page object contains no elements.
     def empty?
-      self.data.empty?
+      data.empty?
     end
 
-    def retrieve(id, opts={})
+    def retrieve(id, opts = {})
       id, retrieve_params = Util.normalize_id(id)
-      resp, opts = request(:get,"#{resource_url}/#{CGI.escape(id)}", retrieve_params, opts)
+      resp, opts = request(:get, "#{resource_url}/#{CGI.escape(id)}", retrieve_params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end
 
@@ -74,13 +74,11 @@ module Stripe
     #
     # This method will try to respect the limit of the current page. If none
     # was given, the default limit will be fetched again.
-    def next_page(params={}, opts={})
-      return self.class.empty_list(opts) if !has_more
+    def next_page(params = {}, opts = {})
+      return self.class.empty_list(opts) unless has_more
       last_id = data.last.id
 
-      params = filters.merge({
-        :starting_after => last_id,
-      }).merge(params)
+      params = filters.merge(starting_after: last_id).merge(params)
 
       list(params, opts)
     end
@@ -89,18 +87,16 @@ module Stripe
     #
     # This method will try to respect the limit of the current page. If none
     # was given, the default limit will be fetched again.
-    def previous_page(params={}, opts={})
+    def previous_page(params = {}, opts = {})
       first_id = data.first.id
 
-      params = filters.merge({
-        :ending_before => first_id,
-      }).merge(params)
+      params = filters.merge(ending_before: first_id).merge(params)
 
       list(params, opts)
     end
 
     def resource_url
-      self.url ||
+      url ||
         raise(ArgumentError, "List object does not contain a 'url' field.")
     end
   end

data/lib/stripe/login_link.rb

@@ -1,9 +1,9 @@
 module Stripe
   class LoginLink < APIResource
-    OBJECT_NAME = 'login_link'
+    OBJECT_NAME = "login_link".freeze
 
-    def self.retrieve(id, opts=nil)
-      raise NotImplementedError.new("Login links do not have IDs and cannot be retrieved. They can only be created using accounts.login_links.create")
+    def self.retrieve(_id, _opts = nil)
+      raise NotImplementedError, "Login links do not have IDs and cannot be retrieved. They can only be created using accounts.login_links.create"
     end
   end
 end

data/lib/stripe/oauth.rb

@@ -12,43 +12,45 @@ module Stripe
       end
     end
 
-    def self.get_client_id(params={})
+    def self.get_client_id(params = {})
       client_id = params[:client_id] || Stripe.client_id
       unless client_id
-        raise AuthenticationError.new('No client_id provided. ' \
+        raise AuthenticationError, "No client_id provided. " \
           'Set your client_id using "Stripe.client_id = <CLIENT-ID>". ' \
-          'You can find your client_ids in your Stripe dashboard at ' \
-          'https://dashboard.stripe.com/account/applications/settings, ' \
-          'after registering your account as a platform. See ' \
-          'https://stripe.com/docs/connect/standalone-accounts for details, ' \
-          'or email support@stripe.com if you have any questions.')
+          "You can find your client_ids in your Stripe dashboard at " \
+          "https://dashboard.stripe.com/account/applications/settings, " \
+          "after registering your account as a platform. See " \
+          "https://stripe.com/docs/connect/standalone-accounts for details, " \
+          "or email support@stripe.com if you have any questions."
       end
       client_id
     end
 
-    def self.authorize_url(params={}, opts={})
+    def self.authorize_url(params = {}, opts = {})
       base = opts[:connect_base] || Stripe.connect_base
 
       params[:client_id] = get_client_id(params)
-      params[:response_type] ||= 'code'
+      params[:response_type] ||= "code"
       query = Util.encode_parameters(params)
 
       "#{base}/oauth/authorize?#{query}"
     end
 
-    def self.token(params={}, opts={})
+    def self.token(params = {}, opts = {})
       opts = Util.normalize_opts(opts)
       resp, opts = OAuthOperations.request(
-        :post, '/oauth/token', params, opts)
+        :post, "/oauth/token", params, opts
+      )
       # This is just going to return a generic StripeObject, but that's okay
       Util.convert_to_stripe_object(resp.data, opts)
     end
 
-    def self.deauthorize(params={}, opts={})
+    def self.deauthorize(params = {}, opts = {})
       opts = Util.normalize_opts(opts)
       params[:client_id] = get_client_id(params)
       resp, opts = OAuthOperations.request(
-        :post, '/oauth/deauthorize', params, opts)
+        :post, "/oauth/deauthorize", params, opts
+      )
       # This is just going to return a generic StripeObject, but that's okay
       Util.convert_to_stripe_object(resp.data, opts)
     end