restforce 5.0.6 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6644bf699621fb5414dce1dce275e5a265fca50305bcfca98864b6c1683f1687
-  data.tar.gz: 5ef0177a3a91dbe1637fc493b7f0bc478fca34c49e392abb1eccdf8bf951aa66
+  metadata.gz: 01b1e2a0404ca613dba1e5bf8dd0cac2672e8ae05a939693c9b06451379bc3f4
+  data.tar.gz: 93fc9d6f07255f56a0bc6b93fc89402f0b6f8b5b4c616f8924e02cb791d21c01
 SHA512:
-  metadata.gz: 7c7d3e8b58743f8d4ae6ae9255c2d89cc78b06a5e963350784ff3c884396bf1ef03fb986f2aba7bd231d8ae9af2f0b2af78a77c98fcb62356ac09b1411753e13
-  data.tar.gz: 5c8bb85fdcd28e5eba8d0939ef1868d42b99d079cddd056941ec7c4cf591d3789caa2b569cafeb8415a89755e567de1a93486dc9c18c5507275adad5631374cc
+  metadata.gz: 24394432042f990f2ef634a7721917fae4bc671c7b9c1a44c16e5bfc11811262ff1489418e769cb5177baacf8ad30e1f0c3fa3506b2e817c3465b324f78fd719
+  data.tar.gz: 5f12f8479aaab44b75a4e0c93832ed245767d5acc659f2a7d854116423e3701aa8e2203cd3ef5018e5894c504b037dee30132a4f0c09cd8b410165c6e612ebc8

data/.circleci/config.yml

@@ -34,23 +34,23 @@ references:
         destination: test-results
 
 jobs:
-  build-ruby271:
+  build-ruby30:
     docker:
-       - image: circleci/ruby:2.7.1
+       - image: circleci/ruby:3.0
     steps: *steps
-  build-ruby266:
+  build-ruby27:
     docker:
-       - image: circleci/ruby:2.6.6
+       - image: circleci/ruby:2.7
     steps: *steps
-  build-ruby258:
+  build-ruby26:
     docker:
-       - image: circleci/ruby:2.5.8
+       - image: circleci/ruby:2.6
     steps: *steps
 
 workflows:
   version: 2
   tests:
     jobs:
-      - build-ruby271
-      - build-ruby266
-      - build-ruby258
+      - build-ruby30
+      - build-ruby27
+      - build-ruby26

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - .*/**/*
     - vendor/**/*
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 
 # Limit lines to 90 characters.
 Layout/LineLength:
@@ -71,4 +71,4 @@ Naming/FileName:
     - Guardfile
 
 Lint/UriEscapeUnescape:
-  Enabled: false
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 5.1.0 (Aug 26, 2021)
+
+* Add official support for Ruby 3.0 (@timrogers)
+* Drop support for Ruby 2.5, which has reached end-of-life (@timrogers)
+* Handle the `QUERY_TIMEOUT` error returned by Salesforce (@timrogers)
+* Remove unnecessary development dependencies for the gem, which can just be in the project's `Gemfile` (@timrogers)
+
 ## 5.0.6 (Jun 17, 2021)
 
 * Handle the `API_DISABLED_FOR_ORG` error returned by Salesforce (@cmac)

data/Gemfile

@@ -3,11 +3,15 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'faye' unless RUBY_PLATFORM == 'java'
+gem 'guard-rspec'
+gem 'guard-rubocop'
 gem 'jruby-openssl', platforms: :jruby
-gem 'jwt'
 gem 'rake'
-
-group :development do
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-end
+gem 'rspec', '~> 3.10.0'
+gem 'rspec-collection_matchers', '~> 1.2.0'
+gem 'rspec-its', '~> 1.3.0'
+gem 'rspec_junit_formatter', '~> 0.4.1'
+gem 'rubocop', '~> 1.20.0'
+gem 'simplecov', '~> 0.21.2'
+gem 'webmock', '~> 3.14.0'

data/README.md

@@ -25,7 +25,7 @@ Features include:
 
 Add this line to your application's Gemfile:
 
-    gem 'restforce', '~> 5.0.6'
+    gem 'restforce', '~> 5.1.0'
 
 And then execute:
 
@@ -35,8 +35,9 @@ Or install it yourself as:
 
     $ gem install restforce
 
-__As of version 5.0.0, this gem is only compatible with Ruby 2.5.0 and later.__ If you're using an earlier Ruby version:
+__As of version 5.0.0, this gem is only compatible with Ruby 2.6.0 and later.__ If you're using an earlier Ruby version:
 
+* for Ruby 2.5, use version 5.0.6 or earlier
 * for Ruby 2.4, use version 4.3.0 or earlier
 * for Ruby 2.3, use version 3.2.0 or earlier
 * for Ruby versions 2.2, 2.1 and 2.0, use version 2.5.3 or earlier
@@ -459,7 +460,7 @@ info.user_id
 
 ### File Uploads
 
-Using the new [Blob Data](http://www.salesforce.com/us/developer/docs/api_rest/Content/dome_sobject_insert_update_blob.htm) api feature (500mb limit):
+Using the new [Blob Data](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_sobject_insert_update_blob.htm) api feature (500mb limit):
 
 ```ruby
 client.create('Document', FolderId: '00lE0000000FJ6H',
@@ -477,7 +478,7 @@ client.create('Document', FolderId: '00lE0000000FJ6H',
                           Body: Base64::encode64(File.read('image.jpg'))
 ```
 
-_See also: [Inserting or updating blob data](http://www.salesforce.com/us/developer/docs/api_rest/Content/dome_sobject_insert_update_blob.htm)_
+_See also: [Inserting or updating blob data](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_sobject_insert_update_blob.htm)_
 
 * * *
 

data/lib/restforce/concerns/api.rb

@@ -380,7 +380,7 @@ module Restforce
             end
           else
             api_patch "sobjects/#{sobject}/#{field}/" \
-              "#{ERB::Util.url_encode(external_id)}", attrs
+                      "#{ERB::Util.url_encode(external_id)}", attrs
           end
 
         response.body.respond_to?(:fetch) ? response.body.fetch('id', true) : true

data/lib/restforce/error_code.rb

@@ -3,8 +3,8 @@
 module Restforce
   module ErrorCode
     GITHUB_ISSUE_URL = "https://github.com/restforce/restforce/issues/new?template=" \
-      "unhandled-salesforce-error.md&title=Unhandled+Salesforce+error%3A+%3Cinsert+" \
-      "error+code+here%3E"
+                       "unhandled-salesforce-error.md&title=Unhandled+Salesforce+error" \
+                       "%3A+%3Cinsert+error+code+here%3E"
 
     # We define all of the known errors returned by Salesforce based on the
     # documentation at
@@ -341,6 +341,8 @@ module Restforce
 
     class PrivateContactOnAsset < ResponseError; end
 
+    class QueryTimeout < ResponseError; end
+
     class RecordInUseByWorkflow < ResponseError; end
 
     class RequestLimitExceeded < ResponseError; end
@@ -573,6 +575,7 @@ module Restforce
       "PLATFORM_EVENT_PUBLISH_FAILED" => PlatformEventPublishFailed,
       "PORTAL_USER_ALREADY_EXISTS_FOR_CONTACT" => PortalUserAlreadyExistsForContact,
       "PRIVATE_CONTACT_ON_ASSET" => PrivateContactOnAsset,
+      "QUERY_TIMEOUT" => QueryTimeout,
       "RECORD_IN_USE_BY_WORKFLOW" => RecordInUseByWorkflow,
       "REQUEST_LIMIT_EXCEEDED" => RequestLimitExceeded,
       "REQUEST_RUNNING_TOO_LONG" => RequestRunningTooLong,
@@ -606,9 +609,9 @@ module Restforce
     def self.get_exception_class(error_code)
       ERROR_EXCEPTION_CLASSES.fetch(error_code) do |_|
         warn "[restforce] An unrecognised error code, `#{error_code}` has been " \
-        "received from Salesforce. Instead of raising an error-specific exception, " \
-        "we'll raise a generic `ResponseError`. Please report this missing error code" \
-        " on GitHub at <#{GITHUB_ISSUE_URL}>."
+             "received from Salesforce. Instead of raising an error-specific exception" \
+             ", we'll raise a generic `ResponseError`. Please report this missing " \
+             "error code on GitHub at <#{GITHUB_ISSUE_URL}>."
 
         # If we've received an unexpected error where we don't have a specific
         # class defined, we can return a generic ResponseError instead
@@ -618,10 +621,10 @@ module Restforce
 
     def self.const_missing(constant_name)
       warn "[restforce] You're referring to a Restforce error that isn't defined, " \
-      "`#{name}::#{constant_name}` (for example by trying to `rescue` it). This might " \
-      "be our fault - we've recently made some changes to how errors are defined. If " \
-      "you're sure that this is a valid Salesforce error, then please create an " \
-      "issue on GitHub at <#{GITHUB_ISSUE_URL}>."
+           "`#{name}::#{constant_name}` (for example by trying to `rescue` it). This " \
+           "might be our fault - we've recently made some changes to how errors are " \
+           "defined. If you're sure that this is a valid Salesforce error, then " \
+           "please create an issue on GitHub at <#{GITHUB_ISSUE_URL}>."
 
       super(constant_name)
     end

data/lib/restforce/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Restforce
-  VERSION = '5.0.6'
+  VERSION = '5.1.0'
 end

data/restforce.gemspec

@@ -22,20 +22,10 @@ Gem::Specification.new do |gem|
     'changelog_uri'   => 'https://github.com/restforce/restforce/blob/master/CHANGELOG.md'
   }
 
-  gem.required_ruby_version = '>= 2.5'
+  gem.required_ruby_version = '>= 2.6'
 
   gem.add_dependency 'faraday', '<= 2.0', '>= 0.9.0'
   gem.add_dependency 'faraday_middleware', ['>= 0.8.8', '<= 2.0']
-
-  gem.add_dependency 'jwt', ['>= 1.5.6']
-
   gem.add_dependency 'hashie', '>= 1.2.0', '< 5.0'
-
-  gem.add_development_dependency 'faye' unless RUBY_PLATFORM == 'java'
-  gem.add_development_dependency 'rspec', '~> 2.14.0'
-  gem.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
-
-  gem.add_development_dependency 'rubocop', '~> 1.17.0'
-  gem.add_development_dependency 'simplecov', '~> 0.21.2'
-  gem.add_development_dependency 'webmock', '~> 3.13.0'
+  gem.add_dependency 'jwt', ['>= 1.5.6']
 end

data/spec/integration/abstract_client_spec.rb

@@ -129,18 +129,15 @@ shared_examples_for Restforce::AbstractClient do
         JSON.parse(fixture('sobject/delete_error_response'))
       end
 
-      subject do
-        lambda do
-          client.update!('Account', Id: '001D000000INjVe', Name: 'Foobar')
-        end
-      end
+      it "raises Faraday::ResourceNotFound" do
+        expect { client.update!('Account', Id: '001D000000INjVe', Name: 'Foobar') }.
+          to raise_error do |exception|
+            expect(exception).to be_a(Faraday::ResourceNotFound)
 
-      it {
-        should raise_error(
-          Faraday::ResourceNotFound,
-          "#{error.first['errorCode']}: #{error.first['message']}"
-        )
-      }
+            expect(exception.message).
+              to start_with("#{error.first['errorCode']}: #{error.first['message']}")
+          end
+      end
     end
   end
 
@@ -158,7 +155,7 @@ shared_examples_for Restforce::AbstractClient do
                fixture: 'sobject/delete_error_response'
 
       subject { client.update('Account', Id: '001D000000INjVe', Name: 'Foobar') }
-      it { should be_false }
+      it { should be false }
     end
 
     context 'with success' do
@@ -172,7 +169,7 @@ shared_examples_for Restforce::AbstractClient do
             client.update('Account', key => '001D000000INjVe', :Name => 'Foobar')
           end
 
-          it { should be_true }
+          it { should be true }
         end
       end
     end
@@ -191,7 +188,7 @@ shared_examples_for Restforce::AbstractClient do
                                                    Name: 'Foobar')
         end
 
-        it { should be_true }
+        it { should be true }
       end
 
       context 'with string external Id key' do
@@ -200,7 +197,7 @@ shared_examples_for Restforce::AbstractClient do
                                                    'Name' => 'Foobar')
         end
 
-        it { should be_true }
+        it { should be true }
       end
     end
 
@@ -257,14 +254,14 @@ shared_examples_for Restforce::AbstractClient do
     context 'with success' do
       requests 'sobjects/Account/001D000000INjVe', method: :delete
 
-      it { should be_true }
+      it { should be true }
     end
 
     context 'with a space in the id' do
       subject(:destroy!) { client.destroy!('Account', '001D000000 INjVe') }
       requests 'sobjects/Account/001D000000%20INjVe', method: :delete
 
-      it { should be_true }
+      it { should be true }
     end
   end
 
@@ -277,13 +274,13 @@ shared_examples_for Restforce::AbstractClient do
                method: :delete,
                status: 404
 
-      it { should be_false }
+      it { should be false }
     end
 
     context 'with success' do
       requests 'sobjects/Account/001D000000INjVe', method: :delete
 
-      it { should be_true }
+      it { should be true }
     end
   end
 
@@ -368,8 +365,8 @@ shared_examples_for Restforce::AbstractClient do
       before do
         @request = stub_login_request(
           with_body: "grant_type=password&client_id=client_id" \
-                        "&client_secret=client_secret&username=foo" \
-                        "&password=barsecurity_token"
+                     "&client_secret=client_secret&username=foo" \
+                     "&password=barsecurity_token"
         ).to_return(status: 200, body: fixture(:auth_success_response))
       end
 
@@ -420,8 +417,8 @@ shared_examples_for Restforce::AbstractClient do
 
         @query_request = stub_login_request(
           with_body: "grant_type=password&client_id=client_id" \
-                        "&client_secret=client_secret&username=foo&" \
-                        "password=barsecurity_token"
+                     "&client_secret=client_secret&username=foo&" \
+                     "password=barsecurity_token"
         ).to_return(status: 200, body: fixture(:auth_success_response))
       end
 
@@ -445,7 +442,7 @@ shared_examples_for Restforce::AbstractClient do
 
       @login = stub_login_request(
         with_body: "grant_type=password&client_id=client_id&client_secret=" \
-                      "client_secret&username=foo&password=barsecurity_token"
+                   "client_secret&username=foo&password=barsecurity_token"
       ).to_return(status: 200, body: fixture(:auth_success_response))
     end
 

data/spec/integration/data/client_spec.rb

@@ -98,17 +98,21 @@ shared_examples_for Restforce::Data::Client do
   end
 
   describe '.subscribe', event_machine: true do
+    let(:faye_double)     { double('Faye') }
+
     context 'when given a single pushtopic' do
       it 'subscribes to the pushtopic' do
-        client.faye.should_receive(:subscribe).with(['/topic/PushTopic'])
+        faye_double.should_receive(:subscribe).with(['/topic/PushTopic'])
+        client.stub faye: faye_double
         client.subscribe('PushTopic')
       end
     end
 
     context 'when given an array of pushtopics' do
       it 'subscribes to each pushtopic' do
-        client.faye.should_receive(:subscribe).with(['/topic/PushTopic1',
+        faye_double.should_receive(:subscribe).with(['/topic/PushTopic1',
                                                      '/topic/PushTopic2'])
+        client.stub faye: faye_double
         client.subscribe(%w[PushTopic1 PushTopic2])
       end
     end

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ Bundler.require :default, :test
 require 'faye' unless RUBY_PLATFORM == 'java'
 
 require 'webmock/rspec'
+require 'rspec/collection_matchers'
+require 'rspec/its'
 
 WebMock.disable_net_connect!
 
@@ -27,6 +29,14 @@ RSpec.configure do |config|
     $stderr = original_stderr
     $stdout = original_stdout
   end
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = %i[expect should]
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = %i[expect should]
+  end
 end
 
 # Requires supporting ruby files with custom matchers and macros, etc,

data/spec/support/client_integration.rb

@@ -5,7 +5,7 @@ module ClientIntegrationExampleGroup
     base.class_eval do
       let(:oauth_token) do
         '00Dx0000000BV7z!AR8AQAxo9UfVkh8AlV0Gomt9Czx9LjHnSSpwBMmbRcgKFmxOtvxjTrKW19ye6P' \
-        'E3Ds1eQz3z8jr3W7_VbWmEu4Q8TVGSTHxs'
+          'E3Ds1eQz3z8jr3W7_VbWmEu4Q8TVGSTHxs'
       end
 
       let(:refresh_token)  { 'refresh' }
@@ -39,13 +39,13 @@ module ClientIntegrationExampleGroup
   end
 
   RSpec.configure do |config|
+    describes = lambda do |described|
+      described <= Restforce::AbstractClient
+    end
+
     config.include self,
-                   example_group: {
-                     describes: lambda do |described|
-                       described <= Restforce::AbstractClient
-                     end,
-                     file_path: %r{spec/integration}
-                   }
+                   file_path: %r{spec/integration},
+                   describes: describes
 
     config.before mashify: false do
       base_options.merge!(mashify: false)

data/spec/support/concerns.rb

@@ -15,6 +15,6 @@ module ConcernsExampleGroup
   end
 
   RSpec.configure do |config|
-    config.include self, example_group: { file_path: %r{spec/unit/concerns} }
+    config.include self, file_path: %r{spec/unit/concerns}
   end
 end

data/spec/support/middleware.rb

@@ -19,8 +19,7 @@ module MiddlewareExampleGroup
   end
 
   RSpec.configure do |config|
-    config.include self,
-                   example_group: { file_path: %r{spec/unit/middleware} }
+    config.include self, file_path: %r{spec/unit/middleware}
   end
 end
 

data/spec/unit/collection_spec.rb

@@ -13,7 +13,7 @@ describe Restforce::Collection do
 
       it                   { should respond_to :each }
       its(:size)           { should eq 1 }
-      its(:has_next_page?) { should be_false }
+      its(:has_next_page?) { should be false }
       it                   { should have_client client }
       its(:page_size)      { should eq 1 }
 
@@ -56,7 +56,7 @@ describe Restforce::Collection do
           should(be_all { |page| expect(page).to be_a Restforce::Collection })
         end
 
-        its(:has_next_page?) { should be_true }
+        its(:has_next_page?) { should be true }
         it { should(be_all { |record| expect(record).to be_a Restforce::SObject }) }
         its(:next_page)      { should be_a Restforce::Collection }
       end
@@ -71,13 +71,13 @@ describe Restforce::Collection do
     context 'with size 1' do
       let(:sobject_fixture) { 'sobject/query_success_response' }
 
-      it { should be_false }
+      it { should be false }
     end
 
     context 'with size 0' do
       let(:sobject_fixture) { 'sobject/query_empty_response' }
 
-      it { should be_true }
+      it { should be true }
     end
   end
 end

data/spec/unit/concerns/api_spec.rb

@@ -11,7 +11,7 @@ describe Restforce::Concerns::API do
     it 'returns the user info from identity url' do
       identity_url = double('identity_url')
       response.body.stub(:identity).and_return(identity_url)
-      client.should_receive(:api_get).with.and_return(response)
+      client.should_receive(:api_get).with(no_args).and_return(response)
 
       identity = double('identity')
       identity.stub(:body).and_return(identity)
@@ -268,7 +268,7 @@ describe Restforce::Concerns::API do
 
       it "delegates to :#{method}!" do
         client.should_receive(:"#{method}!").
-          with(*args).
+          with(no_args).
           and_return(response)
         expect(result).to eq response
       end
@@ -276,7 +276,7 @@ describe Restforce::Concerns::API do
       it 'rescues exceptions' do
         [Faraday::ClientError].each do |exception_klass|
           client.should_receive(:"#{method}!").
-            with(*args).
+            with(no_args).
             and_raise(exception_klass.new(nil))
           expect(result).to eq false
         end
@@ -314,7 +314,7 @@ describe Restforce::Concerns::API do
         it 'sends an HTTP PATCH, and returns true' do
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/1234', StageName: "Call Scheduled")
-          expect(result).to be_true
+          expect(result).to be true
         end
       end
 
@@ -324,7 +324,7 @@ describe Restforce::Concerns::API do
         it 'sends an HTTP PATCH, and encodes the ID' do
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/1234%2F%3Fabc', StageName: "Call Scheduled")
-          expect(result).to be_true
+          expect(result).to be true
         end
       end
 
@@ -348,7 +348,7 @@ describe Restforce::Concerns::API do
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/External_ID__c/1234', {}).
             and_return(response)
-          expect(result).to be_true
+          expect(result).to be true
         end
 
         context 'and the response body is a string' do
@@ -357,7 +357,7 @@ describe Restforce::Concerns::API do
             client.should_receive(:api_patch).
               with('sobjects/Whizbang/External_ID__c/1234', {}).
               and_return(response)
-            expect(result).to be_true
+            expect(result).to be true
           end
         end
       end
@@ -431,7 +431,7 @@ describe Restforce::Concerns::API do
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/External_ID__c/%E3%81%82', {}).
             and_return(response)
-          expect(result).to be_true
+          expect(result).to be true
         end
       end
     end
@@ -448,7 +448,7 @@ describe Restforce::Concerns::API do
           client.should_receive(:api_patch).
             with('sobjects/Whizbang/External_ID__c/1234', {}).
             and_return(response)
-          expect(result).to be_true
+          expect(result).to be true
         end
       end
     end
@@ -462,7 +462,7 @@ describe Restforce::Concerns::API do
     it 'sends and HTTP delete, and returns true' do
       client.should_receive(:api_delete).
         with('sobjects/Whizbang/1234')
-      expect(result).to be_true
+      expect(result).to be true
     end
 
     context 'when the id field contains special characters' do
@@ -471,7 +471,7 @@ describe Restforce::Concerns::API do
       it 'sends an HTTP delete, and encodes the ID' do
         client.should_receive(:api_delete).
           with('sobjects/Whizbang/1234%2F%3Fabc')
-        expect(result).to be_true
+        expect(result).to be true
       end
     end
   end

data/spec/unit/concerns/authentication_spec.rb

@@ -80,11 +80,11 @@ describe Restforce::Concerns::Authentication do
           client_secret: 'secret' }
       end
 
-      it { should be_true }
+      it { should be_truthy }
     end
 
     context 'when username and password options are not provided' do
-      it { should_not be_true }
+      it { should_not be_truthy }
     end
   end
 
@@ -103,11 +103,11 @@ describe Restforce::Concerns::Authentication do
           client_secret: 'secret' }
       end
 
-      it { should be_true }
+      it { should be_truthy }
     end
 
     context 'when oauth options are not provided' do
-      it { should_not be_true }
+      it { should_not be true }
     end
   end
 
@@ -128,11 +128,11 @@ describe Restforce::Concerns::Authentication do
           client_id: 'client' }
       end
 
-      it { should be_true }
+      it { should be_truthy }
     end
 
     context 'when jwt options are not provided' do
-      it { should_not be_true }
+      it { should_not be true }
     end
   end
 end

data/spec/unit/concerns/streaming_spec.rb

@@ -13,10 +13,10 @@ describe Restforce::Concerns::Streaming, event_machine: true do
     it 'subscribes to the topics with faye' do
       faye_double.
         should_receive(:subscribe).
-        with(channels, &subscribe_block)
+        with(channels)
       client.stub faye: faye_double
 
-      client.subscription(channels, &subscribe_block)
+      client.subscription(channels)
     end
 
     context "replay_handlers" do
@@ -110,7 +110,7 @@ describe Restforce::Concerns::Streaming, event_machine: true do
     end
   end
 
-  describe Restforce::Concerns::Streaming::ReplayExtension do
+  describe "ReplayExtension" do
     let(:handlers) { {} }
     let(:extension) { Restforce::Concerns::Streaming::ReplayExtension.new(handlers) }
 

data/spec/unit/config_spec.rb

@@ -76,7 +76,7 @@ describe Restforce do
     subject { Restforce.log? }
 
     context 'by default' do
-      it { should be_false }
+      it { should be false }
     end
   end
 

data/spec/unit/middleware/authentication/jwt_bearer_spec.rb

@@ -17,14 +17,14 @@ describe Restforce::Middleware::Authentication::JWTBearer do
     let(:success_request) do
       stub_login_request(
         body: "grant_type=grant_type—urn:ietf:params:oauth:grant-type:jwt-bearer&" \
-             "assertion=abc1234567890"
+              "assertion=abc1234567890"
       ).to_return(status: 200, body: fixture(:auth_success_response))
     end
 
     let(:fail_request) do
       stub_login_request(
         body: "grant_type=grant_type—urn:ietf:params:oauth:grant-type:jwt-bearer&" \
-             "assertion=abc1234567890"
+              "assertion=abc1234567890"
       ).to_return(status: 400, body: fixture(:refresh_error_response))
     end
   end
@@ -47,14 +47,14 @@ describe Restforce::Middleware::Authentication::JWTBearer do
       let(:success_request) do
         stub_login_request(
           body: "grant_type=grant_type—urn:ietf:params:oauth:grant-type:jwt-bearer&" \
-            "assertion=abc1234567890"
+                "assertion=abc1234567890"
         ).to_return(status: 200, body: fixture(:auth_success_response))
       end
 
       let(:fail_request) do
         stub_login_request(
           body: "grant_type=grant_type—urn:ietf:params:oauth:grant-type:jwt-bearer&" \
-            "assertion=abc1234567890"
+                "assertion=abc1234567890"
         ).to_return(status: 400, body: fixture(:refresh_error_response))
       end
     end

data/spec/unit/middleware/authentication/password_spec.rb

@@ -17,14 +17,14 @@ describe Restforce::Middleware::Authentication::Password do
     let(:success_request) do
       stub_login_request(
         body: "grant_type=password&client_id=client_id&client_secret=client_secret" \
-                 "&username=foo&password=barsecurity_token"
+              "&username=foo&password=barsecurity_token"
       ).to_return(status: 200, body: fixture(:auth_success_response))
     end
 
     let(:fail_request) do
       stub_login_request(
         body: "grant_type=password&client_id=client_id&client_secret=client_secret" \
-                 "&username=foo&password=barsecurity_token"
+              "&username=foo&password=barsecurity_token"
       ).to_return(status: 400, body: fixture(:auth_error_response))
     end
   end

data/spec/unit/middleware/authentication/token_spec.rb

@@ -15,14 +15,14 @@ describe Restforce::Middleware::Authentication::Token do
     let(:success_request) do
       stub_login_request(
         body: "grant_type=refresh_token&refresh_token=refresh_token&" \
-                 "client_id=client_id&client_secret=client_secret"
+              "client_id=client_id&client_secret=client_secret"
       ).to_return(status: 200, body: fixture(:auth_success_response))
     end
 
     let(:fail_request) do
       stub_login_request(
         body: "grant_type=refresh_token&refresh_token=refresh_token&" \
-                 "client_id=client_id&client_secret=client_secret"
+              "client_id=client_id&client_secret=client_secret"
       ).to_return(status: 400, body: fixture(:refresh_error_response))
     end
   end

data/spec/unit/middleware/gzip_spec.rb

@@ -58,11 +58,11 @@ describe Restforce::Middleware::Gzip do
         env[:response_headers]['Content-Encoding'] = 'gzip'
       end
 
-      it { should be_true }
+      it { should be true }
     end
 
     context 'when not gzipped' do
-      it { should be_false }
+      it { should be false }
     end
   end
 end

data/spec/unit/middleware/raise_error_spec.rb

@@ -14,8 +14,10 @@ describe Restforce::Middleware::RaiseError do
       let(:status) { 404 }
 
       it 'raises Restforce::NotFoundError' do
-        expect { on_complete }.to raise_error Restforce::NotFoundError,
-                                              'INVALID_FIELD: error_message'
+        expect { on_complete }.to raise_error do |error|
+          expect(error).to be_a Restforce::NotFoundError
+          expect(error.message).to start_with("INVALID_FIELD: error_message")
+        end
       end
 
       it 'raises an error that inherits from Faraday::ResourceNotFound' do
@@ -40,8 +42,10 @@ describe Restforce::Middleware::RaiseError do
       let(:status) { 400 }
 
       it "raises an error derived from the response's errorCode" do
-        expect { on_complete }.to raise_error Restforce::ErrorCode::InvalidField,
-                                              'INVALID_FIELD: error_message'
+        expect { on_complete }.to raise_error do |error|
+          expect(error).to be_a Restforce::ErrorCode::InvalidField
+          expect(error.message).to start_with("INVALID_FIELD: error_message")
+        end
       end
 
       it 'raises an error that inherits from Faraday::ClientError' do
@@ -53,8 +57,10 @@ describe Restforce::Middleware::RaiseError do
       let(:status) { 401 }
 
       it 'raises Restforce::UnauthorizedError' do
-        expect { on_complete }.to raise_error Restforce::UnauthorizedError,
-                                              'INVALID_FIELD: error_message'
+        expect { on_complete }.to raise_error do |error|
+          expect(error).to be_a Restforce::UnauthorizedError
+          expect(error.message).to start_with("INVALID_FIELD: error_message")
+        end
       end
     end
 
@@ -76,13 +82,17 @@ describe Restforce::Middleware::RaiseError do
       let(:status) { 400 }
 
       it 'raises a generic Restforce::ResponseError' do
-        expect { on_complete }.to raise_error Restforce::ResponseError,
-                                              "(error code missing): #{body}"
+        expect { on_complete }.to raise_error do |error|
+          expect(error).to be_a Restforce::ResponseError
+          expect(error.message).to start_with("(error code missing): An error occured")
+        end
       end
 
       it 'raises an error that inherits from Faraday::ClientError' do
-        expect { on_complete }.to raise_error Faraday::ClientError,
-                                              "(error code missing): #{body}"
+        expect { on_complete }.to raise_error do |error|
+          expect(error).to be_a Faraday::ClientError
+          expect(error.message).to start_with("(error code missing): An error occured")
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.1.0
 platform: ruby
 authors:
 - Tim Rogers
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -51,20 +51,6 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: jwt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -86,89 +72,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: faye
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.5.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: 1.5.6
 description: A lightweight Ruby client for the Salesforce REST API
 email:
 - me@timrogers.co.uk
@@ -328,14 +244,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A lightweight Ruby client for the Salesforce REST API