stripe 3.3.2 → 3.4.1

data/lib/stripe/order.rb

@@ -4,14 +4,14 @@ module Stripe
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'order'
+    OBJECT_NAME = "order".freeze
 
-    def pay(params, opts={})
+    def pay(params, opts = {})
       resp, opts = request(:post, pay_url, params, opts)
       initialize_from(resp.data, opts)
     end
 
-    def return_order(params, opts={})
+    def return_order(params, opts = {})
       resp, opts = request(:post, returns_url, params, opts)
       Util.convert_to_stripe_object(resp.data, opts)
     end
@@ -19,11 +19,11 @@ module Stripe
     private
 
     def pay_url
-      resource_url + '/pay'
+      resource_url + "/pay"
     end
 
     def returns_url
-      resource_url + '/returns'
+      resource_url + "/returns"
     end
   end
 end

data/lib/stripe/order_return.rb

@@ -2,7 +2,7 @@ module Stripe
   class OrderReturn < APIResource
     extend Stripe::APIOperations::List
 
-    OBJECT_NAME = 'order_return'
+    OBJECT_NAME = "order_return".freeze
 
     def self.resource_url
       "/v1/order_returns"

data/lib/stripe/payout.rb

@@ -4,15 +4,15 @@ module Stripe
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'payout'
+    OBJECT_NAME = "payout".freeze
 
     def cancel
-      resp, api_key = self.request(:post, cancel_url)
+      resp, api_key = request(:post, cancel_url)
       initialize_from(resp.data, api_key)
     end
 
     def cancel_url
-      resource_url + '/cancel'
+      resource_url + "/cancel"
     end
   end
 end

data/lib/stripe/plan.rb

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

data/lib/stripe/product.rb

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

data/lib/stripe/recipient.rb

@@ -1,14 +1,15 @@
 module Stripe
+  # Recipients objects are deprecated. Please use Stripe Connect instead.
   class Recipient < APIResource
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Delete
     include Stripe::APIOperations::Save
     extend Stripe::APIOperations::List
 
-    OBJECT_NAME = 'recipient'
+    OBJECT_NAME = "recipient".freeze
 
     def transfers
-      Transfer.all({ :recipient => id }, @api_key)
+      Transfer.all({ recipient: id }, @api_key)
     end
   end
 end

data/lib/stripe/recipient_transfer.rb

@@ -1,6 +1,5 @@
 module Stripe
   class RecipientTransfer < StripeObject
-
-    OBJECT_NAME = 'recipient_transfer'
+    OBJECT_NAME = "recipient_transfer".freeze
   end
 end

data/lib/stripe/refund.rb

@@ -4,6 +4,6 @@ module Stripe
     extend Stripe::APIOperations::List
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'refund'
+    OBJECT_NAME = "refund".freeze
   end
 end

data/lib/stripe/reversal.rb

@@ -3,18 +3,18 @@ module Stripe
     extend Stripe::APIOperations::List
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'transfer_reversal'
+    OBJECT_NAME = "transfer_reversal".freeze
 
     def resource_url
       "#{Transfer.resource_url}/#{CGI.escape(transfer)}/reversals/#{CGI.escape(id)}"
     end
 
-    def self.update(id, params=nil, opts=nil)
-      raise NotImplementedError.new("Reversals cannot be updated without a transfer ID. Update a reversal using `r = transfer.reversals.retrieve('reversal_id'); r.save`")
+    def self.update(_id, _params = nil, _opts = nil)
+      raise NotImplementedError, "Reversals cannot be updated without a transfer ID. Update a reversal using `r = transfer.reversals.retrieve('reversal_id'); r.save`"
     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')")
+    def self.retrieve(_id, _opts = {})
+      raise NotImplementedError, "Reversals cannot be retrieved without a transfer ID. Retrieve a reversal using transfer.reversals.retrieve('reversal_id')"
     end
   end
 end

data/lib/stripe/singleton_api_resource.rb

@@ -2,7 +2,7 @@ module Stripe
   class SingletonAPIResource < APIResource
     def self.resource_url
       if self == SingletonAPIResource
-        raise NotImplementedError.new('SingletonAPIResource is an abstract class.  You should perform actions on its subclasses (Account, etc.)')
+        raise NotImplementedError, "SingletonAPIResource is an abstract class.  You should perform actions on its subclasses (Account, etc.)"
       end
       "/v1/#{CGI.escape(class_name.downcase)}"
     end
@@ -11,8 +11,8 @@ module Stripe
       self.class.resource_url
     end
 
-    def self.retrieve(opts={})
-      instance = self.new(nil, Util.normalize_opts(opts))
+    def self.retrieve(opts = {})
+      instance = new(nil, Util.normalize_opts(opts))
       instance.refresh
       instance
     end

data/lib/stripe/sku.rb

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

data/lib/stripe/source.rb

@@ -3,20 +3,23 @@ module Stripe
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'source'
+    OBJECT_NAME = "source".freeze
 
-    def delete(params={}, opts={})
-      if respond_to?(:customer) && !customer.nil? && !customer.empty?
-        url = "#{Customer.resource_url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
-        resp, opts = request(:delete, url, params, Util.normalize_opts(opts))
-        initialize_from(resp.data, opts)
-      else
-        raise NotImplementedError.new("Source objects cannot be deleted, they can only be detached from customer objects. This source object does not appear to be currently attached to a customer object.")
+    def delete(params = {}, opts = {})
+      if !respond_to?(:customer) || customer.nil? || customer.empty?
+        raise NotImplementedError,
+              "Source objects cannot be deleted, they can only be detached " \
+              "from customer objects. This source object does not appear to " \
+              "be currently attached to a customer object."
       end
+
+      url = "#{Customer.resource_url}/#{CGI.escape(customer)}/sources/#{CGI.escape(id)}"
+      resp, opts = request(:delete, url, params, Util.normalize_opts(opts))
+      initialize_from(resp.data, opts)
     end
 
-    def verify(params={}, opts={})
-      resp, opts = request(:post, resource_url + '/verify', params, Util.normalize_opts(opts))
+    def verify(params = {}, opts = {})
+      resp, opts = request(:post, resource_url + "/verify", params, Util.normalize_opts(opts))
       initialize_from(resp.data, opts)
     end
   end

data/lib/stripe/stripe_client.rb

@@ -79,11 +79,11 @@ module Stripe
       # Apply exponential backoff with initial_network_retry_delay on the
       # number of num_retries so far as inputs. Do not allow the number to exceed
       # max_network_retry_delay.
-      sleep_seconds = [Stripe.initial_network_retry_delay * (2 ** (num_retries - 1)), Stripe.max_network_retry_delay].min
+      sleep_seconds = [Stripe.initial_network_retry_delay * (2**(num_retries - 1)), Stripe.max_network_retry_delay].min
 
       # Apply some jitter by randomizing the value in the range of (sleep_seconds
       # / 2) to (sleep_seconds).
-      sleep_seconds = sleep_seconds * (0.5 * (1 + rand()))
+      sleep_seconds *= (0.5 * (1 + rand))
 
       # But never sleep less than the base sleep seconds.
       sleep_seconds = [Stripe.initial_network_retry_delay, sleep_seconds].max
@@ -96,13 +96,13 @@ module Stripe
     #     client = StripeClient.new
     #     charge, resp = client.request { Charge.create }
     #
-    def request(&block)
+    def request
       @last_response = nil
       old_stripe_client = Thread.current[:stripe_client]
       Thread.current[:stripe_client] = self
 
       begin
-        res = block.call
+        res = yield
         [res, @last_response]
       ensure
         Thread.current[:stripe_client] = old_stripe_client
@@ -110,7 +110,7 @@ module Stripe
     end
 
     def execute_request(method, path,
-        api_base: nil, api_key: nil, headers: {}, params: {})
+                        api_base: nil, api_key: nil, headers: {}, params: {})
 
       api_base ||= Stripe.api_base
       api_key ||= Stripe.api_key
@@ -120,36 +120,38 @@ module Stripe
       params = Util.objects_to_ids(params)
       url = api_url(path, api_base)
 
+      body = nil
+      query_string = nil
+
       case method.to_s.downcase.to_sym
       when :get, :head, :delete
-        # Make params into GET parameters
-        url += "#{URI.parse(url).query ? '&' : '?'}#{Util.encode_parameters(params)}" if params && params.any?
-        payload = nil
+        query_string = Util.encode_parameters(params) if params && params.any?
+        url += "#{URI.parse(url).query ? '&' : '?'}#{query_string}" unless query_string.nil?
       else
-        if headers[:content_type] && headers[:content_type] == "multipart/form-data"
-          payload = params
-        else
-          payload = Util.encode_parameters(params)
-        end
+        body = if headers[:content_type] && headers[:content_type] == "multipart/form-data"
+                 params
+               else
+                 Util.encode_parameters(params)
+               end
       end
 
-      headers = request_headers(api_key, method).
-        update(Util.normalize_headers(headers))
+      headers = request_headers(api_key, method)
+                .update(Util.normalize_headers(headers))
 
       # stores information on the request we're about to make so that we don't
       # have to pass as many parameters around for logging.
-      context = RequestLogContext.new(
-        account: headers["Stripe-Account"],
-        api_key: api_key,
-        api_version: headers["Stripe-Version"],
-        idempotency_key: headers["Idempotency-Key"],
-        method: method,
-        path: path,
-        payload: payload,
-      )
+      context = RequestLogContext.new
+      context.account         = headers["Stripe-Account"]
+      context.api_key         = api_key
+      context.api_version     = headers["Stripe-Version"]
+      context.body            = body
+      context.idempotency_key = headers["Idempotency-Key"]
+      context.method          = method
+      context.path            = path
+      context.query_string    = query_string
 
       http_resp = execute_request_with_rescues(api_base, context) do
-        conn.run_request(method, url, payload, headers) do |req|
+        conn.run_request(method, url, body, headers) do |req|
           req.options.open_timeout = Stripe.open_timeout
           req.options.timeout = Stripe.read_timeout
         end
@@ -168,40 +170,40 @@ module Stripe
 
     private
 
-    def api_url(url='', api_base=nil)
+    def api_url(url = "", api_base = nil)
       (api_base || Stripe.api_base) + url
     end
 
     def check_api_key!(api_key)
       unless api_key
-        raise AuthenticationError.new('No API key provided. ' \
+        raise AuthenticationError, "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.')
+          "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 ' \
-          'email support@stripe.com if you have any questions.)')
-      end
+      return unless api_key =~ /\s/
+
+      raise AuthenticationError, "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
 
-    def execute_request_with_rescues(api_base, context, &block)
+    def execute_request_with_rescues(api_base, context)
       num_retries = 0
       begin
         request_start = Time.now
         log_request(context, num_retries)
-        resp = block.call
+        resp = yield
         context = context.dup_from_response(resp)
         log_response(context, request_start, resp.status, resp.body)
 
       # We rescue all exceptions from a request so that we have an easy spot to
       # implement our retry logic across the board. We'll re-raise if it's a type
       # of exception that we didn't expect to handle.
-      rescue => e
+      rescue StandardError => e
         # If we modify context we copy it into a new variable so as not to
         # taint the original on a retry.
         error_context = context
@@ -209,7 +211,7 @@ module Stripe
         if e.respond_to?(:response) && e.response
           error_context = context.dup_from_response(e.response)
           log_response(error_context, request_start,
-            e.response[:status], e.response[:body])
+                       e.response[:status], e.response[:body])
         else
           log_response_error(error_context, request_start, e)
         end
@@ -239,7 +241,7 @@ module Stripe
     end
 
     def general_api_error(status, body)
-      APIError.new("Invalid response object from API: #{body.inspect} " +
+      APIError.new("Invalid response object from API: #{body.inspect} " \
                    "(HTTP response code was #{status})",
                    http_status: status, http_body: body)
     end
@@ -260,34 +262,30 @@ module Stripe
         resp = StripeResponse.from_faraday_hash(http_resp)
         error_data = resp.data[:error]
 
-        unless error_data
-          raise StripeError.new("Indeterminate error")
-        end
-
+        raise StripeError, "Indeterminate error" unless error_data
       rescue JSON::ParserError, StripeError
         raise general_api_error(http_resp[:status], http_resp[:body])
       end
 
-      if error_data.is_a?(String)
-        error = specific_oauth_error(resp, error_data, context)
-      else
-        error = specific_api_error(resp, error_data, context)
-      end
+      error = if error_data.is_a?(String)
+                specific_oauth_error(resp, error_data, context)
+              else
+                specific_api_error(resp, error_data, context)
+              end
 
       error.response = resp
       raise(error)
     end
 
     def specific_api_error(resp, error_data, context)
-      Util.log_error('Stripe API error',
-        status: resp.http_status,
-        error_code: error_data['code'],
-        error_message: error_data['message'],
-        error_param: error_data['param'],
-        error_type: error_data['type'],
-        idempotency_key: context.idempotency_key,
-        request_id: context.request_id
-      )
+      Util.log_error("Stripe API error",
+                     status: resp.http_status,
+                     error_code: error_data["code"],
+                     error_message: error_data["message"],
+                     error_param: error_data["param"],
+                     error_type: error_data["type"],
+                     idempotency_key: context.idempotency_key,
+                     request_id: context.request_id)
 
       case resp.http_status
       when 400, 404
@@ -336,26 +334,25 @@ module Stripe
     def specific_oauth_error(resp, error_code, context)
       description = resp.data[:error_description] || error_code
 
-      Util.log_error('Stripe OAuth error',
-        status: resp.http_status,
-        error_code: error_code,
-        error_description: description,
-        idempotency_key: context.idempotency_key,
-        request_id: context.request_id
-      )
+      Util.log_error("Stripe OAuth error",
+                     status: resp.http_status,
+                     error_code: error_code,
+                     error_description: description,
+                     idempotency_key: context.idempotency_key,
+                     request_id: context.request_id)
 
       args = [error_code, description, {
         http_status: resp.http_status, http_body: resp.http_body,
-        json_body: resp.data, http_headers: resp.http_headers
-      }]
+        json_body: resp.data, http_headers: resp.http_headers,
+      },]
 
       case error_code
-      when 'invalid_client'            then OAuth::InvalidClientError.new(*args)
-      when 'invalid_grant'             then OAuth::InvalidGrantError.new(*args)
-      when 'invalid_request'           then OAuth::InvalidRequestError.new(*args)
-      when 'invalid_scope'             then OAuth::InvalidScopeError.new(*args)
-      when 'unsupported_grant_type'    then OAuth::UnsupportedGrantTypeError.new(*args)
-      when 'unsupported_response_type' then OAuth::UnsupportedResponseTypeError.new(*args)
+      when "invalid_client"            then OAuth::InvalidClientError.new(*args)
+      when "invalid_grant"             then OAuth::InvalidGrantError.new(*args)
+      when "invalid_request"           then OAuth::InvalidRequestError.new(*args)
+      when "invalid_scope"             then OAuth::InvalidScopeError.new(*args)
+      when "unsupported_grant_type"    then OAuth::UnsupportedGrantTypeError.new(*args)
+      when "unsupported_response_type" then OAuth::UnsupportedResponseTypeError.new(*args)
       else
         # We'd prefer that all errors are typed, but we create a generic
         # OAuthError in case we run into a code that we don't recognize.
@@ -363,12 +360,11 @@ module Stripe
       end
     end
 
-    def handle_network_error(e, context, num_retries, api_base=nil)
-      Util.log_error('Stripe network error',
-        error_message: e.message,
-        idempotency_key: context.idempotency_key,
-        request_id: context.request_id
-      )
+    def handle_network_error(e, context, num_retries, api_base = nil)
+      Util.log_error("Stripe network error",
+                     error_message: e.message,
+                     idempotency_key: context.idempotency_key,
+                     request_id: context.request_id)
 
       case e
       when Faraday::ConnectionFailed
@@ -383,7 +379,7 @@ module Stripe
                   "command line."
 
       when Faraday::TimeoutError
-        api_base = Stripe.api_base unless api_base
+        api_base ||= Stripe.api_base
         message = "Could not connect to Stripe (#{api_base}). " \
           "Please check your internet connection and try again. " \
           "If this problem persists, you should check Stripe's service status at " \
@@ -395,11 +391,9 @@ module Stripe
 
       end
 
-      if num_retries > 0
-        message += " Request was retried #{num_retries} times."
-      end
+      message += " Request was retried #{num_retries} times." if num_retries > 0
 
-      raise APIConnectionError.new(message + "\n\n(Network error: #{e.message})")
+      raise APIConnectionError, message + "\n\n(Network error: #{e.message})"
     end
 
     def request_headers(api_key, method)
@@ -409,28 +403,28 @@ module Stripe
       end
 
       headers = {
-        'User-Agent' => user_agent,
-        'Authorization' => "Bearer #{api_key}",
-        'Content-Type' => 'application/x-www-form-urlencoded'
+        "User-Agent" => user_agent,
+        "Authorization" => "Bearer #{api_key}",
+        "Content-Type" => "application/x-www-form-urlencoded",
       }
 
       # 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) && Stripe.max_network_retries > 0
-        headers['Idempotency-Key'] ||= SecureRandom.uuid
+      if %i[post delete].include?(method) && Stripe.max_network_retries > 0
+        headers["Idempotency-Key"] ||= SecureRandom.uuid
       end
 
-      headers['Stripe-Version'] = Stripe.api_version if Stripe.api_version
-      headers['Stripe-Account'] = Stripe.stripe_account if Stripe.stripe_account
+      headers["Stripe-Version"] = Stripe.api_version if Stripe.api_version
+      headers["Stripe-Account"] = Stripe.stripe_account if Stripe.stripe_account
 
       user_agent = @system_profiler.user_agent
       begin
         headers.update(
-          'X-Stripe-Client-User-Agent' => JSON.generate(user_agent)
+          "X-Stripe-Client-User-Agent" => JSON.generate(user_agent)
         )
-      rescue => e
+      rescue StandardError => e
         headers.update(
-          'X-Stripe-Client-Raw-User-Agent' => user_agent.inspect,
+          "X-Stripe-Client-Raw-User-Agent" => user_agent.inspect,
           :error => "#{e} (#{e.class})"
         )
       end
@@ -440,54 +434,50 @@ module Stripe
 
     def log_request(context, num_retries)
       Util.log_info("Request to Stripe API",
-        account: context.account,
-        api_version: context.api_version,
-        idempotency_key: context.idempotency_key,
-        method: context.method,
-        num_retries: num_retries,
-        path: context.path
-      )
+                    account: context.account,
+                    api_version: context.api_version,
+                    idempotency_key: context.idempotency_key,
+                    method: context.method,
+                    num_retries: num_retries,
+                    path: context.path)
       Util.log_debug("Request details",
-        body: context.payload,
-        idempotency_key: context.idempotency_key
-      )
+                     body: context.body,
+                     idempotency_key: context.idempotency_key,
+                     query_string: context.query_string)
     end
     private :log_request
 
     def log_response(context, request_start, status, body)
       Util.log_info("Response from Stripe API",
-        account: context.account,
-        api_version: context.api_version,
-        elapsed: Time.now - request_start,
-        idempotency_key: context.idempotency_key,
-        method: context.method,
-        path: context.path,
-        request_id: context.request_id,
-        status: status
-      )
+                    account: context.account,
+                    api_version: context.api_version,
+                    elapsed: Time.now - request_start,
+                    idempotency_key: context.idempotency_key,
+                    method: context.method,
+                    path: context.path,
+                    request_id: context.request_id,
+                    status: status)
       Util.log_debug("Response details",
-        body: body,
-        idempotency_key: context.idempotency_key,
-        request_id: context.request_id,
-      )
-      if context.request_id
-        Util.log_debug("Dashboard link for request",
-          idempotency_key: context.idempotency_key,
-          request_id: context.request_id,
-          url: Util.request_id_dashboard_url(context.request_id, context.api_key)
-        )
-      end
+                     body: body,
+                     idempotency_key: context.idempotency_key,
+                     request_id: context.request_id)
+
+      return unless context.request_id
+
+      Util.log_debug("Dashboard link for request",
+                     idempotency_key: context.idempotency_key,
+                     request_id: context.request_id,
+                     url: Util.request_id_dashboard_url(context.request_id, context.api_key))
     end
     private :log_response
 
     def log_response_error(context, request_start, e)
       Util.log_error("Request error",
-        elapsed: Time.now - request_start,
-        error_message: e.message,
-        idempotency_key: context.idempotency_key,
-        method: context.method,
-        path: context.path,
-      )
+                     elapsed: Time.now - request_start,
+                     error_message: e.message,
+                     idempotency_key: context.idempotency_key,
+                     method: context.method,
+                     path: context.path)
     end
     private :log_response_error
 
@@ -495,26 +485,16 @@ module Stripe
     # that we can log certain information. It's useful because it means that we
     # don't have to pass around as many parameters.
     class RequestLogContext
+      attr_accessor :body
       attr_accessor :account
       attr_accessor :api_key
       attr_accessor :api_version
       attr_accessor :idempotency_key
       attr_accessor :method
       attr_accessor :path
-      attr_accessor :payload
+      attr_accessor :query_string
       attr_accessor :request_id
 
-      def initialize(account: nil, api_key: nil, api_version: nil,
-          idempotency_key: nil, method: nil, path: nil, payload: nil)
-        self.account = account
-        self.api_key = api_key
-        self.api_version = api_version
-        self.idempotency_key = idempotency_key
-        self.method = method
-        self.path = path
-        self.payload = payload
-      end
-
       # The idea with this method is that we might want to update some of
       # context information because a response that we've received from the API
       # contains information that's more authoritative than what we started
@@ -528,12 +508,12 @@ module Stripe
         # object with a `headers` method, but on error what it puts into
         # `e.response` is an untyped `Hash`.
         headers = if resp.is_a?(Faraday::Response)
-          resp.headers
-        else
-          resp[:headers]
-        end
+                    resp.headers
+                  else
+                    resp[:headers]
+                  end
 
-        context = self.dup
+        context = dup
         context.account = headers["Stripe-Account"]
         context.api_version = headers["Stripe-Version"]
         context.idempotency_key = headers["Idempotency-Key"]
@@ -546,31 +526,31 @@ module Stripe
     # in so that we can generate a rich user agent header to help debug
     # integrations.
     class SystemProfiler
-      def self.get_uname
-        if File.exist?('/proc/version')
-          File.read('/proc/version').strip
+      def self.uname
+        if File.exist?("/proc/version")
+          File.read("/proc/version").strip
         else
-          case RbConfig::CONFIG['host_os']
+          case RbConfig::CONFIG["host_os"]
           when /linux|darwin|bsd|sunos|solaris|cygwin/i
-            get_uname_from_system
+            uname_from_system
           when /mswin|mingw/i
-            get_uname_from_system_ver
+            uname_from_system_ver
           else
             "unknown platform"
           end
         end
       end
 
-      def self.get_uname_from_system
-        (`uname -a 2>/dev/null` || '').strip
+      def self.uname_from_system
+        (`uname -a 2>/dev/null` || "").strip
       rescue Errno::ENOENT
         "uname executable not found"
       rescue Errno::ENOMEM # couldn't create subprocess
         "uname lookup failed"
       end
 
-      def self.get_uname_from_system_ver
-        (`ver` || '').strip
+      def self.uname_from_system_ver
+        (`ver` || "").strip
       rescue Errno::ENOENT
         "ver executable not found"
       rescue Errno::ENOMEM # couldn't create subprocess
@@ -578,23 +558,23 @@ module Stripe
       end
 
       def initialize
-        @uname = self.class.get_uname
+        @uname = self.class.uname
       end
 
       def user_agent
         lang_version = "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})"
 
         {
-          :application => Stripe.app_info,
-          :bindings_version => Stripe::VERSION,
-          :lang => 'ruby',
-          :lang_version => lang_version,
-          :platform => RUBY_PLATFORM,
-          :engine => defined?(RUBY_ENGINE) ? RUBY_ENGINE : '',
-          :publisher => 'stripe',
-          :uname => @uname,
-          :hostname => Socket.gethostname,
-        }.delete_if { |k, v| v.nil? }
+          application: Stripe.app_info,
+          bindings_version: Stripe::VERSION,
+          lang: "ruby",
+          lang_version: lang_version,
+          platform: RUBY_PLATFORM,
+          engine: defined?(RUBY_ENGINE) ? RUBY_ENGINE : "",
+          publisher: "stripe",
+          uname: @uname,
+          hostname: Socket.gethostname,
+        }.delete_if { |_k, v| v.nil? }
       end
     end
   end