stripe-ruby V5

.rubocop.yml

@@ -2,21 +2,31 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
  DisplayCopNames: true
- TargetRubyVersion: 2.1
+ TargetRubyVersion: 2.3
 
 Layout/CaseIndentation:
  EnforcedStyle: end
 
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
  EnforcedStyle: consistent
 
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
  EnforcedStyle: consistent
 
-Metrics/LineLength:
+# This can be re-enabled once we're 2.3+ only and can use the squiggly heredoc
+# operator. Prior to that, Rubocop recommended bringing in a library like
+# ActiveSupport to get heredoc indentation, which is just terrible.
+Layout/IndentHeredoc:
+ Enabled: false
+
+Metrics/ClassLength:
  Exclude:
  - "test/**/*.rb"
+
+Metrics/LineLength:
+ Exclude:
  - "lib/stripe/resources/**/*.rb"
+ - "test/**/*.rb"
 
 Metrics/MethodLength:
  # There's ~2 long methods in `StripeClient`. If we want to truncate those a
@@ -33,6 +43,9 @@ Style/AccessModifierDeclarations:
 Style/FrozenStringLiteralComment:
  EnforcedStyle: always
 
+Style/NumericPredicate:
+ Enabled: false
+
 Style/StringLiterals:
  EnforcedStyle: double_quotes
 

.rubocop_todo.yml

@@ -1,24 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-05-24 10:18:48 -0700 using RuboCop version 0.57.2.
+# on 2019-07-30 09:56:31 +0800 using RuboCop version 0.73.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 20
+# Offense count: 23
 Metrics/AbcSize:
- Max: 53
+ Max: 51
 
-# Offense count: 31
+# Offense count: 33
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
- Max: 498
+ Max: 509
 
-# Offense count: 11
+# Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
- Max: 673
+ Max: 694
 
 # Offense count: 12
 Metrics/CyclomaticComplexity:
@@ -29,10 +30,10 @@ Metrics/CyclomaticComplexity:
 Metrics/ParameterLists:
  Max: 7
 
-# Offense count: 7
+# Offense count: 8
 Metrics/PerceivedComplexity:
  Max: 17
 
-# Offense count: 84
+# Offense count: 86
 Style/Documentation:
  Enabled: false

.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 
 rvm:
- - 2.1
- - 2.2
  - 2.3
  - 2.4
  - 2.5
  - 2.6
- - jruby-9.0.5.0
+ - jruby-9.2.7.0
 
 notifications:
  email:
@@ -25,8 +23,6 @@ cache:
  - stripe-mock
 
 before_install:
- # Install bundler 1.x, because we need to support Ruby 2.1 for now
- - gem install bundler -v "~> 1.0"
  # Unpack and start stripe-mock so that the test suite can talk to it
  - |
  if [ ! -d "stripe-mock/stripe-mock_${STRIPE_MOCK_VERSION}" ]; then

Gemfile

@@ -7,6 +7,7 @@ gemspec
 group :development do
  gem "coveralls", require: false
  gem "mocha", "~> 0.13.2"
+ gem "rack", ">= 2.0.6"
  gem "rake"
  gem "shoulda-context"
  gem "test-unit"
@@ -18,18 +19,7 @@ group :development do
  # `Gemfile.lock` checked in, so to prevent good builds from suddenly going
  # bad, pin to a specific version number here. Try to keep this relatively
  # up-to-date, but it's not the end of the world if it's not.
- # Note that 0.57.2 is the most recent version we can use until we drop
- # support for Ruby 2.1.
- gem "rubocop", "0.57.2"
-
- # Rack 2.0+ requires Ruby >= 2.2.2 which is problematic for the test suite on
- # older Ruby versions. Check Ruby the version here and put a maximum
- # constraint on Rack if necessary.
- if RUBY_VERSION >= "2.2.2"
- gem "rack", ">= 2.0.6"
- else
- gem "rack", ">= 1.6.11", "< 2.0" # rubocop:disable Bundler/DuplicatedGem
- end
+ gem "rubocop", "0.73"
 
  platforms :mri do
  gem "byebug"

README.md

@@ -39,7 +39,7 @@ gem build stripe.gemspec
 
 ### Requirements
 
-- Ruby 2.1+.
+- Ruby 2.3+.
 
 ### Bundler
 
@@ -112,15 +112,13 @@ Stripe::Charge.retrieve(
 )
 ```
 
-### Configuring a Client
+### Accessing a response object
 
-While a default HTTP client is used by default, it's also possible to have the
-library use any client supported by [Faraday][faraday] by initializing a
-`Stripe::StripeClient` object and giving it a connection:
+Get access to response objects by initializing a client and using its `request`
+method:
 
 ```ruby
-conn = Faraday.new
-client = Stripe::StripeClient.new(conn)
+client = Stripe::StripeClient.new
 charge, resp = client.request do
  Stripe::Charge.retrieve(
  "ch_18atAXCdGbJFKhCuBAa4532Z",
@@ -275,7 +273,6 @@ Update the bundled [stripe-mock] by editing the version number found in
 [api-keys]: https://dashboard.stripe.com/account/apikeys
 [connect]: https://stripe.com/connect
 [curl]: http://curl.haxx.se/docs/caextract.html
-[faraday]: https://github.com/lostisland/faraday
 [idempotency-keys]: https://stripe.com/docs/api/ruby#idempotent_requests
 [stripe-mock]: https://github.com/stripe/stripe-mock
 [versioning]: https://stripe.com/docs/api/ruby#versioning

Rakefile

@@ -13,7 +13,8 @@ RuboCop::RakeTask.new
 
 desc "Update bundled certs"
 task :update_certs do
- require "faraday"
+ require "net/http"
+ require "uri"
 
  fetch_file "https://curl.haxx.se/ca/cacert.pem",
  ::File.expand_path("../lib/data/ca-certificates.crt", __FILE__)
@@ -23,14 +24,14 @@ end
 # helpers
 #
 
-def fetch_file(url, dest)
+def fetch_file(uri, dest)
  ::File.open(dest, "w") do |file|
- resp = Faraday.get(url)
- unless resp.status == 200
- abort("bad response when fetching: #{url}\n" \
- "Status #{resp.status}: #{resp.body}")
+ resp = Net::HTTP.get_response(URI.parse(uri))
+ unless resp.code.to_i == 200
+ abort("bad response when fetching: #{uri}\n" \
+ "Status #{resp.code}: #{resp.body}")
  end
  file.write(resp.body)
- puts "Successfully fetched: #{url}"
+ puts "Successfully fetched: #{uri}"
  end
 end

lib/stripe.rb

@@ -3,9 +3,9 @@
 # Stripe Ruby bindings
 # API spec at https://stripe.com/docs/api
 require "cgi"
-require "faraday"
 require "json"
 require "logger"
+require "net/http"
 require "openssl"
 require "rbconfig"
 require "securerandom"
@@ -28,10 +28,13 @@
 require "stripe/errors"
 require "stripe/object_types"
 require "stripe/util"
+require "stripe/connection_manager"
+require "stripe/multipart_encoder"
 require "stripe/stripe_client"
 require "stripe/stripe_object"
 require "stripe/stripe_response"
 require "stripe/list_object"
+require "stripe/error_object"
 require "stripe/api_resource"
 require "stripe/singleton_api_resource"
 require "stripe/webhook"
@@ -70,9 +73,20 @@ module Stripe
  @enable_telemetry = true
 
  class << self
- attr_accessor :stripe_account, :api_key, :api_base, :verify_ssl_certs,
- :api_version, :client_id, :connect_base, :uploads_base,
- :open_timeout, :read_timeout, :proxy
+ attr_accessor :api_key
+ attr_accessor :api_version
+ attr_accessor :client_id
+ attr_accessor :stripe_account
+
+ # These all get manual attribute writers so that we can reset connections
+ # if they change.
+ attr_reader :api_base
+ attr_reader :connect_base
+ attr_reader :open_timeout
+ attr_reader :proxy
+ attr_reader :read_timeout
+ attr_reader :uploads_base
+ attr_reader :verify_ssl_certs
 
  attr_reader :max_network_retry_delay, :initial_network_retry_delay
  end
@@ -87,6 +101,11 @@ def self.app_info=(info)
  @app_info = info
  end
 
+ def self.api_base=(api_base)
+ @api_base = api_base
+ StripeClient.clear_all_connection_managers
+ end
+
  # The location of a file containing a bundle of CA certificates. By default
  # the library will use an included bundle that can successfully validate
  # Stripe certificates.
@@ -99,6 +118,8 @@ def self.ca_bundle_path=(path)
 
  # empty this field so a new store is initialized
  @ca_store = nil
+
+ StripeClient.clear_all_connection_managers
  end
 
  # A certificate store initialized from the the bundle in #ca_bundle_path and
@@ -118,6 +139,19 @@ def self.ca_store
  end
  end
 
+ def self.connection_base=(connection_base)
+ @connection_base = connection_base
+ StripeClient.clear_all_connection_managers
+ end
+
+ def self.enable_telemetry?
+ @enable_telemetry
+ end
+
+ def self.enable_telemetry=(val)
+ @enable_telemetry = val
+ end
+
  # map to the same values as the standard library's logger
  LEVEL_DEBUG = Logger::DEBUG
  LEVEL_ERROR = Logger::ERROR
@@ -172,12 +206,19 @@ def self.max_network_retries=(val)
  @max_network_retries = val.to_i
  end
 
- def self.enable_telemetry?
- @enable_telemetry
+ def self.open_timeout=(open_timeout)
+ @open_timeout = open_timeout
+ StripeClient.clear_all_connection_managers
  end
 
- def self.enable_telemetry=(val)
- @enable_telemetry = val
+ def self.proxy=(proxy)
+ @proxy = proxy
+ StripeClient.clear_all_connection_managers
+ end
+
+ def self.read_timeout=(read_timeout)
+ @read_timeout = read_timeout
+ StripeClient.clear_all_connection_managers
  end
 
  # Sets some basic information about the running application that's sent along
@@ -194,14 +235,14 @@ def self.set_app_info(name, partner_id: nil, url: nil, version: nil)
  }
  end
 
- # DEPRECATED. Use `Util#encode_parameters` instead.
- def self.uri_encode(params)
- Util.encode_parameters(params)
+ def self.uploads_base=(uploads_base)
+  @uploads_base = uploads_base
+ StripeClient.clear_all_connection_managers
  end
- private_class_method :uri_encode
- class << self
- extend Gem::Deprecate
- deprecate :uri_encode, "Stripe::Util#encode_parameters", 2016, 1
+
+ def self.verify_ssl_certs=(verify_ssl_certs)
+ @verify_ssl_certs = verify_ssl_certs
+ StripeClient.clear_all_connection_managers
  end
 end
 

lib/stripe/api_operations/list.rb

@@ -19,12 +19,6 @@ def list(filters = {}, opts = {})
 
  obj
  end
-
- # The original version of #list was given the somewhat unfortunate name of
- # #all, and this alias allows us to maintain backward compatibility (the
- # choice was somewhat misleading in the way that it only returned a single
- # page rather than all objects).
- alias all list
  end
  end
 end