gocardless_pro 2.21.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c285e5a1284e099a2840ea4dfb7a8282a73a38aa0def7e81f522654b4be5922
-  data.tar.gz: 0443f073f12c0c6d69029a4a79d28634978274e73b6d1bc0a1517066c44b66e8
+  metadata.gz: 3bb8531d374a6fe482eaaccbc49cd9cbf1575f880cb9633c0b0848ca09157b76
+  data.tar.gz: 24e1f269a875c46dd8a2165f856ba18a4acea648aed82a600de26425bb32bd3d
 SHA512:
-  metadata.gz: bf2401b3823b41bd1d562a80f0e7a8b0847a86f04e1ec29ad2e55b3caf814e39ea379f0686c6108b91de81701b8cebc697e0bd1f7cd4741c44176785c01bcc27
-  data.tar.gz: f8aa9bd7ff1c8f969d54ae654b324395572459ec065e603601dbe5eb9a38ec61852724820dc8423bc7407e47004434dcee4b880b3a4d2678086b0f0729dece07
+  metadata.gz: b93423658f351048e9dd31cb216a86d2c389638d2079647457f68a521eaa4f749844c199cc2cfbb44904dcc18ed9608f94698d1e2e3201341e833714c8a6e6bc
+  data.tar.gz: a2836a224de279066f96d8fa28238368271cbfe967bda9015655ce68cca8262466821d6a923b87db2a050f85e99f14758de9c8214f61fd0089ae127a0cb229d2

data/.circleci/config.yml

@@ -1,50 +1,32 @@
-version: 2
-references:
-  test_library: &test_library
+version: 2.1
+
+jobs:
+  test: &test
     parallelism: 1
+    parameters:
+      faraday-version: { type: string }
+      ruby-version: { type: string }
+    docker:
+      - image: ruby:<<parameters.ruby-version>>
+        environment:
+          - FARADAY_VERSION=<<parameters.faraday-version>>
     steps:
       - checkout
-      - run: |
-          bundle install
-          bundle exec rspec
-jobs:
-  test_ruby_2_5:
-    <<: *test_library
-    docker:
-      - image: ruby:2.5
-
-  test_ruby_2_4:
-    <<: *test_library
-    docker:
-      - image: ruby:2.4
-
-  test_ruby_2_3:
-    <<: *test_library
-    docker:
-      - image: ruby:2.3
-
-  test_ruby_2_2:
-    <<: *test_library
-    docker:
-      - image: ruby:2.2
-
-  test_ruby_2_1:
-    <<: *test_library
-    docker:
-      - image: ruby:2.1
-
-  test_ruby_2_0:
-    <<: *test_library
-    docker:
-      - image: ruby:2.0
+      - run: bundle install && bundle exec rspec
 
 workflows:
   version: 2
-  build:
+  tests:
     jobs:
-      - test_ruby_2_5
-      - test_ruby_2_4
-      - test_ruby_2_3
-      - test_ruby_2_2
-      - test_ruby_2_1
-      - test_ruby_2_0
+      - test:
+          matrix:
+            parameters:
+              faraday-version: ["0.9.2", "1.0"]
+              ruby-version: ["2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7"]
+            exclude:
+              - faraday-version: "1.0"
+                ruby-version: "2.0"
+              - faraday-version: "1.0"
+                ruby-version: "2.1"
+              - faraday-version: "1.0"
+                ruby-version: "2.2"

data/Gemfile

@@ -1,2 +1,9 @@
 source 'https://rubygems.org'
 gemspec
+
+# We support both pre-1.x and post-1.x Faraday versions, but to ensure compatibility we
+# pin this gem against each in separate runs of CI, using the FARADAY_VERSION env var. For
+# more details on the values, see .circleci/config.yml.
+if ENV.key?("FARADAY_VERSION")
+  gem 'faraday', "~> #{ENV["FARADAY_VERSION"]}"
+end

data/gocardless_pro.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', ['>= 0.9.2', '< 1.0']
+  spec.add_dependency 'faraday', ['>= 0.9.2', '< 2']
 
   spec.add_development_dependency 'rspec', '~> 3.7.0'
-  spec.add_development_dependency 'webmock', '~> 1.18'
+  spec.add_development_dependency 'webmock', '~> 3.8.3'
   spec.add_development_dependency 'rubocop', '~> 0.49.1'
   spec.add_development_dependency 'yard', '~> 0.9.11'
 

data/lib/gocardless_pro/api_service.rb

@@ -23,7 +23,7 @@ module GoCardlessPro
       @url = url
       root_url, @path_prefix = unpack_url(url)
       http_adapter = options[:http_adapter] || [:net_http]
-      connection_options = options[:connection_options]
+      connection_options = options.fetch(:connection_options, {})
 
       @connection = Faraday.new(root_url, connection_options) do |faraday|
         faraday.response :raise_gocardless_errors

data/lib/gocardless_pro/client.rb

@@ -148,7 +148,7 @@ module GoCardlessPro
           'User-Agent' => user_agent.to_s,
           'Content-Type' => 'application/json',
           'GoCardless-Client-Library' => 'gocardless-pro-ruby',
-          'GoCardless-Client-Version' => '2.21.0',
+          'GoCardless-Client-Version' => '2.22.0',
         },
       }
     end

data/lib/gocardless_pro/version.rb

@@ -4,5 +4,5 @@ end
 
 module GoCardlessPro
   # Current version of the GC gem
-  VERSION = '2.21.0'.freeze
+  VERSION = '2.22.0'.freeze
 end

data/spec/services/creditor_bank_accounts_service_spec.rb

@@ -692,7 +692,7 @@ describe GoCardlessPro::Services::CreditorBankAccountsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/customer_bank_accounts_service_spec.rb

@@ -754,7 +754,7 @@ describe GoCardlessPro::Services::CustomerBankAccountsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/customer_notifications_service_spec.rb

@@ -45,7 +45,7 @@ describe GoCardlessPro::Services::CustomerNotificationsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/customers_service_spec.rb

@@ -882,7 +882,7 @@ describe GoCardlessPro::Services::CustomersService do
         stub = stub_request(:delete, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { delete_response }.to raise_error(Faraday::TimeoutError)
+        expect { delete_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/instalment_schedules_service_spec.rb

@@ -927,7 +927,7 @@ describe GoCardlessPro::Services::InstalmentSchedulesService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/mandate_imports_service_spec.rb

@@ -363,7 +363,7 @@ describe GoCardlessPro::Services::MandateImportsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end
@@ -432,7 +432,7 @@ describe GoCardlessPro::Services::MandateImportsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/mandates_service_spec.rb

@@ -718,7 +718,7 @@ describe GoCardlessPro::Services::MandatesService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end
@@ -797,7 +797,7 @@ describe GoCardlessPro::Services::MandatesService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/payments_service_spec.rb

@@ -790,7 +790,7 @@ describe GoCardlessPro::Services::PaymentsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end
@@ -877,7 +877,7 @@ describe GoCardlessPro::Services::PaymentsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/redirect_flows_service_spec.rb

@@ -411,7 +411,7 @@ describe GoCardlessPro::Services::RedirectFlowsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

data/spec/services/subscriptions_service_spec.rb

@@ -916,7 +916,7 @@ describe GoCardlessPro::Services::SubscriptionsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end
@@ -1017,7 +1017,7 @@ describe GoCardlessPro::Services::SubscriptionsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end
@@ -1118,7 +1118,7 @@ describe GoCardlessPro::Services::SubscriptionsService do
         stub = stub_request(:post, /.*api.gocardless.com#{stub_url}/).
                to_timeout
 
-        expect { post_response }.to raise_error(Faraday::TimeoutError)
+        expect { post_response }.to raise_error(Faraday::ConnectionFailed)
         expect(stub).to have_been_requested
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gocardless_pro
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.22.0
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -19,7 +19,7 @@ dependencies:
         version: 0.9.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.9.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: 3.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: 3.8.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A gem for calling the GoCardless Pro API