stripe 3.3.2 → 3.4.1

data/lib/stripe/stripe_object.rb

@@ -5,11 +5,9 @@ module Stripe
     @@permanent_attributes = Set.new([:id])
 
     # The default :id method is deprecated and isn't useful to us
-    if method_defined?(:id)
-      undef :id
-    end
+    undef :id if method_defined?(:id)
 
-    def initialize(id=nil, opts={})
+    def initialize(id = nil, opts = {})
       id, @retrieve_params = Util.normalize_id(id)
       @opts = Util.normalize_opts(opts)
       @original_values = {}
@@ -21,11 +19,11 @@ module Stripe
       @values[:id] = id if id
     end
 
-    def self.construct_from(values, opts={})
+    def self.construct_from(values, opts = {})
       values = Stripe::Util.symbolize_names(values)
 
       # work around protected #initialize_from for now
-      self.new(values[:id]).send(:initialize_from, values, opts)
+      new(values[:id]).send(:initialize_from, values, opts)
     end
 
     # Determines the equality of two Stripe objects. Stripe objects are
@@ -42,13 +40,13 @@ module Stripe
       @values.fetch(:deleted, false)
     end
 
-    def to_s(*args)
+    def to_s(*_args)
       JSON.pretty_generate(to_hash)
     end
 
     def inspect
-      id_string = (self.respond_to?(:id) && !self.id.nil?) ? " id=#{self.id}" : ""
-      "#<#{self.class}:0x#{self.object_id.to_s(16)}#{id_string}> JSON: " + JSON.pretty_generate(@values)
+      id_string = respond_to?(:id) && !id.nil? ? " id=#{id}" : ""
+      "#<#{self.class}:0x#{object_id.to_s(16)}#{id_string}> JSON: " + JSON.pretty_generate(@values)
     end
 
     # Re-initializes the object based on a hash of values (usually one that's
@@ -57,11 +55,11 @@ module Stripe
     #
     # Please don't use this method. If you're trying to do mass assignment, try
     # #initialize_from instead.
-    def refresh_from(values, opts, partial=false)
+    def refresh_from(values, opts, partial = false)
       initialize_from(values, opts, partial)
     end
     extend Gem::Deprecate
-    deprecate :refresh_from, "#update_attributes", 2016, 01
+    deprecate :refresh_from, "#update_attributes", 2016, 1
 
     # Mass assigns attributes on the model.
     #
@@ -108,7 +106,7 @@ module Stripe
       @values.values
     end
 
-    def to_json(*a)
+    def to_json(*_a)
       JSON.generate(@values)
     end
 
@@ -121,14 +119,13 @@ module Stripe
         value.respond_to?(:to_hash) ? value.to_hash : value
       end
 
-      @values.inject({}) do |acc, (key, value)|
+      @values.each_with_object({}) do |(key, value), acc|
         acc[key] = case value
                    when Array
                      value.map(&maybe_to_hash)
                    else
                      maybe_to_hash.call(value)
                    end
-        acc
       end
     end
 
@@ -136,27 +133,13 @@ module Stripe
       @values.each(&blk)
     end
 
-    def _dump(level)
-      # The StripeClient instance in @opts is not serializable and is not
-      # really a property of the StripeObject, so we exclude it when
-      # dumping
-      opts = @opts.clone
-      opts.delete(:client)
-      Marshal.dump([@values, opts])
-    end
-
-    def self._load(args)
-      values, opts = Marshal.load(args)
-      construct_from(values, opts)
-    end
-
     # Sets all keys within the StripeObject as unsaved so that they will be
     # included with an update when #serialize_params is called. This method is
     # also recursive, so any StripeObjects contained as values or which are
     # values in a tenant array are also marked as dirty.
     def dirty!
       @unsaved_values = Set.new(@values.keys)
-      @values.each do |k, v|
+      @values.each_value do |v|
         dirty_value!(v)
       end
     end
@@ -182,7 +165,7 @@ module Stripe
 
       # a `nil` that makes it out of `#serialize_params_value` signals an empty
       # value that we shouldn't appear in the serialized form of the object
-      update_hash.reject! { |_, v| v == nil }
+      update_hash.reject! { |_, v| v.nil? }
 
       update_hash
     end
@@ -197,8 +180,6 @@ module Stripe
       deprecate :serialize_params, "#serialize_params", 2016, 9
     end
 
-    protected
-
     # A protected field is one that doesn't get an accessor assigned to it
     # (i.e. `obj.public = ...`) and one which is not allowed to be updated via
     # the class level `Model.update(id, { ... })`.
@@ -206,6 +187,8 @@ module Stripe
       []
     end
 
+    protected
+
     def metaclass
       class << self; self; end
     end
@@ -221,9 +204,7 @@ module Stripe
 
           # Remove methods for the accessor's reader and writer.
           [k, :"#{k}=", :"#{k}?"].each do |method_name|
-            if method_defined?(method_name)
-              remove_method(method_name)
-            end
+            remove_method(method_name) if method_defined?(method_name)
           end
         end
       end
@@ -241,10 +222,9 @@ module Stripe
           define_method(k) { @values[k] }
           define_method(:"#{k}=") do |v|
             if v == ""
-              raise ArgumentError.new(
-                "You cannot set #{k} to an empty string. " \
+              raise ArgumentError, "You cannot set #{k} to an empty string. " \
                 "We interpret empty strings as nil in requests. " \
-                "You may set (object).#{k} = nil to delete the property.")
+                "You may set (object).#{k} = nil to delete the property."
             end
             @values[k] = Util.convert_to_stripe_object(v, @opts)
             dirty_value!(@values[k])
@@ -260,7 +240,7 @@ module Stripe
 
     def method_missing(name, *args)
       # TODO: only allow setting in updateable classes.
-      if name.to_s.end_with?('=')
+      if name.to_s.end_with?("=")
         attr = name.to_s[0...-1].to_sym
 
         # Pull out the assigned value. This is only used in the case of a
@@ -269,31 +249,32 @@ module Stripe
         val = args.first
 
         # the second argument is only required when adding boolean accessors
-        add_accessors([attr], { attr => val })
+        add_accessors([attr], attr => val)
 
         begin
           mth = method(name)
         rescue NameError
-          raise NoMethodError.new("Cannot set #{attr} on this object. HINT: you can't set: #{@@permanent_attributes.to_a.join(', ')}")
+          raise NoMethodError, "Cannot set #{attr} on this object. HINT: you can't set: #{@@permanent_attributes.to_a.join(', ')}"
         end
         return mth.call(args[0])
-      else
-        return @values[name] if @values.has_key?(name)
+      elsif @values.key?(name)
+        return @values[name]
       end
 
       begin
         super
       rescue NoMethodError => e
-        if @transient_values.include?(name)
-          raise NoMethodError.new(e.message + ".  HINT: The '#{name}' attribute was set in the past, however.  It was then wiped when refreshing the object with the result returned by Stripe's API, probably as a result of a save().  The attributes currently available on this object are: #{@values.keys.join(', ')}")
-        else
-          raise
-        end
+        # If we notice the accessed name if our set of transient values we can
+        # give the user a slightly more helpful error message. If not, just
+        # raise right away.
+        raise unless @transient_values.include?(name)
+
+        raise NoMethodError, e.message + ".  HINT: The '#{name}' attribute was set in the past, however.  It was then wiped when refreshing the object with the result returned by Stripe's API, probably as a result of a save().  The attributes currently available on this object are: #{@values.keys.join(', ')}"
       end
     end
 
     def respond_to_missing?(symbol, include_private = false)
-      @values && @values.has_key?(symbol) || super
+      @values && @values.key?(symbol) || super
     end
 
     # Re-initializes the object based on a hash of values (usually one that's
@@ -308,9 +289,11 @@ module Stripe
     # * +:opts:+ Options for StripeObject like an API key.
     # * +:partial:+ Indicates that the re-initialization should not attempt to
     #   remove accessors.
-    def initialize_from(values, opts, partial=false)
+    def initialize_from(values, opts, partial = false)
       @opts = Util.normalize_opts(opts)
-      @original_values = Marshal.load(Marshal.dump(values)) # deep copy
+
+      # the `#send` is here so that we can keep this method private
+      @original_values = self.class.send(:deep_copy, values)
 
       removed = partial ? Set.new : Set.new(@values.keys - values.keys)
       added = Set.new(values.keys - @values.keys)
@@ -328,8 +311,8 @@ module Stripe
         @unsaved_values.delete(k)
       end
 
-      update_attributes(values, opts, :dirty => false)
-      values.each do |k, _|
+      update_attributes(values, opts, dirty: false)
+      values.each_key do |k|
         @transient_values.delete(k)
         @unsaved_values.delete(k)
       end
@@ -338,9 +321,8 @@ module Stripe
     end
 
     def serialize_params_value(value, original, unsaved, force, key: nil)
-      case true
-      when value == nil
-        ''
+      if value.nil?
+        ""
 
       # The logic here is that essentially any object embedded in another
       # object that had a `type` is actually an API resource of a different
@@ -364,10 +346,10 @@ module Stripe
       # We throw an error if a property was set explicitly but we can't do
       # anything with it because the integration is probably not working as the
       # user intended it to.
-      when value.is_a?(APIResource) && !value.save_with_parent
+      elsif value.is_a?(APIResource) && !value.save_with_parent
         if !unsaved
           nil
-        elsif value.respond_to?(:id) && value.id != nil
+        elsif value.respond_to?(:id) && !value.id.nil?
           value
         else
           raise ArgumentError, "Cannot save property `#{key}` containing " \
@@ -375,15 +357,11 @@ module Stripe
             "not marked as `save_with_parent`."
         end
 
-      when value.is_a?(Array)
+      elsif value.is_a?(Array)
         update = value.map { |v| serialize_params_value(v, nil, true, force) }
 
         # This prevents an array that's unchanged from being resent.
-        if update != serialize_params_value(original, nil, true, force)
-          update
-        else
-          nil
-        end
+        update if update != serialize_params_value(original, nil, true, force)
 
       # Handle a Hash for now, but in the long run we should be able to
       # eliminate all places where hashes are stored as values internally by
@@ -395,11 +373,11 @@ module Stripe
       # existing array being held by a StripeObject. This could happen for
       # example by appending a new hash onto `additional_owners` for an
       # account.
-      when value.is_a?(Hash)
+      elsif value.is_a?(Hash)
         Util.convert_to_stripe_object(value, @opts).serialize_params
 
-      when value.is_a?(StripeObject)
-        update = value.serialize_params(:force => force)
+      elsif value.is_a?(StripeObject)
+        update = value.serialize_params(force: force)
 
         # If the entire object was replaced, then we need blank each field of
         # the old object that held a value. The new serialized values will
@@ -415,6 +393,30 @@ module Stripe
 
     private
 
+    # Produces a deep copy of the given object including support for arrays,
+    # hashes, and StripeObjects.
+    def self.deep_copy(obj)
+      case obj
+      when Array
+        obj.map { |e| deep_copy(e) }
+      when Hash
+        obj.each_with_object({}) do |(k, v), copy|
+          copy[k] = deep_copy(v)
+          copy
+        end
+      when StripeObject
+        StripeObject.construct_from(
+          deep_copy(obj.instance_variable_get(:@values)),
+          obj.instance_variable_get(:@opts).select do |k, _v|
+            Util::OPTS_COPYABLE.include?(k)
+          end
+        )
+      else
+        obj
+      end
+    end
+    private_class_method :deep_copy
+
     def dirty_value!(value)
       case value
       when Array
@@ -428,15 +430,14 @@ module Stripe
     # StripeObject.
     def empty_values(obj)
       values = case obj
-      when Hash         then obj
-      when StripeObject then obj.instance_variable_get(:@values)
-      else
-        raise ArgumentError, "#empty_values got unexpected object type: #{obj.class.name}"
-      end
-
-      values.inject({}) do |update, (k, _)|
-        update[k] = ''
-        update
+               when Hash         then obj
+               when StripeObject then obj.instance_variable_get(:@values)
+               else
+                 raise ArgumentError, "#empty_values got unexpected object type: #{obj.class.name}"
+               end
+
+      values.each_with_object({}) do |(k, _), update|
+        update[k] = ""
       end
     end
   end

data/lib/stripe/subscription.rb

@@ -5,21 +5,21 @@ module Stripe
     include Stripe::APIOperations::Save
     include Stripe::APIOperations::Delete
 
-    OBJECT_NAME = 'subscription'
+    OBJECT_NAME = "subscription".freeze
 
     save_nested_resource :source
 
     def delete_discount
       _, opts = request(:delete, discount_url)
-      initialize_from({ :discount => nil }, opts, true)
+      initialize_from({ discount: nil }, opts, true)
     end
 
-    def self.update(id, params={}, opts={})
+    def self.update(id, params = {}, opts = {})
       params[:items] = Util.array_to_hash(params[:items]) if params[:items]
       super(id, params, opts)
     end
 
-    def self.create(params={}, opts={})
+    def self.create(params = {}, opts = {})
       params[:items] = Util.array_to_hash(params[:items]) if params[:items]
       super(params, opts)
     end
@@ -27,7 +27,7 @@ module Stripe
     private
 
     def discount_url
-      resource_url + '/discount'
+      resource_url + "/discount"
     end
   end
 end

data/lib/stripe/subscription_item.rb

@@ -5,10 +5,10 @@ module Stripe
     extend Stripe::APIOperations::List
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'subscription_item'
+    OBJECT_NAME = "subscription_item".freeze
 
     def self.resource_url
-      '/v1/subscription_items'
+      "/v1/subscription_items"
     end
   end
 end

data/lib/stripe/three_d_secure.rb

@@ -2,7 +2,7 @@ module Stripe
   class ThreeDSecure < APIResource
     extend Stripe::APIOperations::Create
 
-    OBJECT_NAME = 'three_d_secure'
+    OBJECT_NAME = "three_d_secure".freeze
 
     def self.resource_url
       "/v1/3d_secure"

data/lib/stripe/token.rb

@@ -2,6 +2,6 @@ module Stripe
   class Token < APIResource
     extend Stripe::APIOperations::Create
 
-    OBJECT_NAME = 'token'
+    OBJECT_NAME = "token".freeze
   end
 end

data/lib/stripe/transfer.rb

@@ -4,15 +4,15 @@ module Stripe
     extend Stripe::APIOperations::Create
     include Stripe::APIOperations::Save
 
-    OBJECT_NAME = 'transfer'
+    OBJECT_NAME = "transfer".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/util.rb

@@ -2,6 +2,22 @@ require "cgi"
 
 module Stripe
   module Util
+    # Options that a user is allowed to specify.
+    OPTS_USER_SPECIFIED = Set[
+      :api_key,
+      :idempotency_key,
+      :stripe_account,
+      :stripe_version
+    ].freeze
+
+    # Options that should be copyable from one StripeObject to another
+    # including options that may be internal.
+    OPTS_COPYABLE = (OPTS_USER_SPECIFIED + Set[:api_base]).freeze
+
+    # Options that should be persisted between API requests. This includes
+    # client, which is an object containing an HTTP client to reuse.
+    OPTS_KEYS_TO_PERSIST = (OPTS_USER_SPECIFIED + Set[:client]).freeze
+
     def self.objects_to_ids(h)
       case h
       when APIResource
@@ -91,25 +107,25 @@ module Stripe
 
     def self.log_error(message, data = {})
       if !Stripe.logger.nil? ||
-          !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_ERROR
+         !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_ERROR
         log_internal(message, data, color: :cyan,
-          level: Stripe::LEVEL_ERROR, logger: Stripe.logger, out: $stderr)
+                                    level: Stripe::LEVEL_ERROR, logger: Stripe.logger, out: $stderr)
       end
     end
 
     def self.log_info(message, data = {})
       if !Stripe.logger.nil? ||
-          !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_INFO
+         !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_INFO
         log_internal(message, data, color: :cyan,
-          level: Stripe::LEVEL_INFO, logger: Stripe.logger, out: $stdout)
+                                    level: Stripe::LEVEL_INFO, logger: Stripe.logger, out: $stdout)
       end
     end
 
     def self.log_debug(message, data = {})
       if !Stripe.logger.nil? ||
-          !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_DEBUG
+         !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_DEBUG
         log_internal(message, data, color: :blue,
-          level: Stripe::LEVEL_DEBUG, logger: Stripe.logger, out: $stdout)
+                                    level: Stripe::LEVEL_DEBUG, logger: Stripe.logger, out: $stdout)
       end
     end
 
@@ -117,13 +133,12 @@ module Stripe
       # This is nominally equivalent to File.readable?, but that can
       # report incorrect results on some more oddball filesystems
       # (such as AFS)
-      begin
-        File.open(file) { |f| }
-      rescue
-        false
-      else
-        true
-      end
+
+      File.open(file) { |f| }
+    rescue StandardError
+      false
+    else
+      true
     end
 
     def self.symbolize_names(object)
@@ -131,7 +146,11 @@ module Stripe
       when Hash
         new_hash = {}
         object.each do |key, value|
-          key = (key.to_sym rescue key) || key
+          key = (begin
+                   key.to_sym
+                 rescue StandardError
+                   key
+                 end) || key
           new_hash[key] = symbolize_names(value)
         end
         new_hash
@@ -147,8 +166,8 @@ module Stripe
     # involves escaping special characters from parameter keys and values (e.g.
     # `&`).
     def self.encode_parameters(params)
-      Util.flatten_params(params).
-        map { |k,v| "#{url_encode(k)}=#{url_encode(v)}" }.join('&')
+      Util.flatten_params(params)
+          .map { |k, v| "#{url_encode(k)}=#{url_encode(v)}" }.join("&")
     end
 
     # Transforms an array into a hash with integer keys. Used for a small
@@ -158,7 +177,7 @@ module Stripe
       case array
       when Array
         hash = {}
-        array.each_with_index { |v,i| hash[i.to_s] = v }
+        array.each_with_index { |v, i| hash[i.to_s] = v }
         hash
       else
         array
@@ -173,16 +192,16 @@ module Stripe
         # Don't use strict form encoding by changing the square bracket control
         # characters back to their literals. This is fine by the server, and
         # makes these parameter strings easier to read.
-        gsub('%5B', '[').gsub('%5D', ']')
+        gsub("%5B", "[").gsub("%5D", "]")
     end
 
-    def self.flatten_params(params, parent_key=nil)
+    def self.flatten_params(params, parent_key = nil)
       result = []
 
       # do not sort the final output because arrays (and arrays of hashes
       # especially) can be order sensitive, but do sort incoming parameters
       params.each do |key, value|
-        calculated_key = parent_key ? "#{parent_key}[#{key}]" : "#{key}"
+        calculated_key = parent_key ? "#{parent_key}[#{key}]" : key.to_s
         if value.is_a?(Hash)
           result += flatten_params(value, calculated_key)
         elsif value.is_a?(Array)
@@ -211,7 +230,7 @@ module Stripe
     end
 
     def self.normalize_id(id)
-      if id.kind_of?(Hash) # overloaded id
+      if id.is_a?(Hash) # overloaded id
         params_hash = id.dup
         id = params_hash.delete(:id)
       else
@@ -225,22 +244,22 @@ module Stripe
     def self.normalize_opts(opts)
       case opts
       when String
-        {:api_key => opts}
+        { api_key: opts }
       when Hash
-        check_api_key!(opts.fetch(:api_key)) if opts.has_key?(:api_key)
+        check_api_key!(opts.fetch(:api_key)) if opts.key?(:api_key)
         opts.clone
       else
-        raise TypeError.new('normalize_opts expects a string or a hash')
+        raise TypeError, "normalize_opts expects a string or a hash"
       end
     end
 
     def self.check_string_argument!(key)
-      raise TypeError.new("argument must be a string") unless key.is_a?(String)
+      raise TypeError, "argument must be a string" unless key.is_a?(String)
       key
     end
 
     def self.check_api_key!(key)
-      raise TypeError.new("api_key must be a string") unless key.is_a?(String)
+      raise TypeError, "api_key must be a string" unless key.is_a?(String)
       key
     end
 
@@ -250,15 +269,14 @@ module Stripe
     # certain key values when the user could have set them with a variety of
     # diffent naming schemes.
     def self.normalize_headers(headers)
-      headers.inject({}) do |new_headers, (k, v)|
+      headers.each_with_object({}) do |(k, v), new_headers|
         if k.is_a?(Symbol)
-          k = titlecase_parts(k.to_s.gsub("_", "-"))
+          k = titlecase_parts(k.to_s.tr("_", "-"))
         elsif k.is_a?(String)
           k = titlecase_parts(k)
         end
 
         new_headers[k] = v
-        new_headers
       end
     end
 
@@ -279,22 +297,24 @@ module Stripe
 
       res = 0
       b.each_byte { |byte| res |= byte ^ l.shift }
-      res == 0
+      res.zero?
     end
 
-    private
+    #
+    # private
+    #
 
     COLOR_CODES = {
-      :black   => 0, :light_black    => 60,
-      :red     => 1, :light_red      => 61,
-      :green   => 2, :light_green    => 62,
-      :yellow  => 3, :light_yellow   => 63,
-      :blue    => 4, :light_blue     => 64,
-      :magenta => 5, :light_magenta  => 65,
-      :cyan    => 6, :light_cyan     => 66,
-      :white   => 7, :light_white    => 67,
-      :default => 9
-    }
+      black:   0, light_black:   60,
+      red:     1, light_red:     61,
+      green:   2, light_green:   62,
+      yellow:  3, light_yellow:  63,
+      blue:    4, light_blue:    64,
+      magenta: 5, light_magenta: 65,
+      cyan:    6, light_cyan:    66,
+      white:   7, light_white:   67,
+      default: 9,
+    }.freeze
     private_constant :COLOR_CODES
 
     # We use a pretty janky version of form encoding (Rack's) that supports
@@ -317,16 +337,16 @@ module Stripe
     def self.check_array_of_maps_start_keys!(arr)
       expected_key = nil
       arr.each do |item|
-        return if !item.is_a?(Hash)
-        return if item.count == 0
+        break unless item.is_a?(Hash)
+        break if item.count.zero?
 
         first_key = item.first[0]
 
         if expected_key
           if expected_key != first_key
             raise ArgumentError,
-              "All maps nested in an array should start with the same key " +
-              "(expected starting key '#{expected_key}', got '#{first_key}')"
+                  "All maps nested in an array should start with the same key " \
+                  "(expected starting key '#{expected_key}', got '#{first_key}')"
           end
         else
           expected_key = first_key
@@ -362,34 +382,29 @@ module Stripe
     # TODO: Make these named required arguments when we drop support for Ruby
     # 2.0.
     def self.log_internal(message, data = {}, color: nil, level: nil, logger: nil, out: nil)
-      data_str = data.select { |k,v| !v.nil? }.
-        map { |(k,v)|
-          "%s=%s" % [
-            colorize(k, color, !out.nil? && out.isatty),
-            wrap_logfmt_value(v)
-          ]
-        }.join(" ")
+      data_str = data.reject { |_k, v| v.nil? }
+                     .map do |(k, v)|
+        format("%s=%s", colorize(k, color, !out.nil? && out.isatty), wrap_logfmt_value(v))
+      end.join(" ")
 
       if !logger.nil?
         # the library's log levels are mapped to the same values as the
         # standard library's logger
         logger.log(level,
-          "message=%s %s" % [wrap_logfmt_value(message), data_str])
+                   format("message=%s %s", wrap_logfmt_value(message), data_str))
       elsif out.isatty
-        out.puts "%s %s %s" %
-          [colorize(level_name(level)[0, 4].upcase, color, out.isatty), message, data_str]
+        out.puts format("%s %s %s", colorize(level_name(level)[0, 4].upcase, color, out.isatty), message, data_str)
       else
-        out.puts "message=%s level=%s %s" %
-          [wrap_logfmt_value(message), level_name(level), data_str]
+        out.puts format("message=%s level=%s %s", wrap_logfmt_value(message), level_name(level), data_str)
       end
     end
     private_class_method :log_internal
 
     def self.titlecase_parts(s)
-      s.split("-").
-        select { |p| p != "" }.
-        map { |p| p[0].upcase + p[1..-1].downcase }.
-        join("-")
+      s.split("-")
+       .reject { |p| p == "" }
+       .map { |p| p[0].upcase + p[1..-1].downcase }
+       .join("-")
     end
     private_class_method :titlecase_parts
 
@@ -406,7 +421,7 @@ module Stripe
       if %r{[^\w\-/]} =~ val
         # If the string contains any special characters, escape any double
         # quotes it has, remove newlines, and wrap the whole thing in quotes.
-        %{"%s"} % val.gsub('"', '\"').gsub("\n", "")
+        format(%("%s"), val.gsub('"', '\"').delete("\n"))
       else
         # Otherwise use the basic value if it looks like a standard set of
         # characters (and allow a few special characters like hyphens, and