restforce 5.0.6 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6644bf699621fb5414dce1dce275e5a265fca50305bcfca98864b6c1683f1687
-  data.tar.gz: 5ef0177a3a91dbe1637fc493b7f0bc478fca34c49e392abb1eccdf8bf951aa66
+  metadata.gz: 891d81fbf377945b09db6058467d21da1720d985e70ad060e4bcbe35d5efc9f6
+  data.tar.gz: 2ce207d94d49504e28680d7b854633cc3c2c0b329ed23b04769528799b71785e
 SHA512:
-  metadata.gz: 7c7d3e8b58743f8d4ae6ae9255c2d89cc78b06a5e963350784ff3c884396bf1ef03fb986f2aba7bd231d8ae9af2f0b2af78a77c98fcb62356ac09b1411753e13
-  data.tar.gz: 5c8bb85fdcd28e5eba8d0939ef1868d42b99d079cddd056941ec7c4cf591d3789caa2b569cafeb8415a89755e567de1a93486dc9c18c5507275adad5631374cc
+  metadata.gz: 04e9f867ebadf6a8d61ffad3ebdb14b9924011df9b408efb9f17bb8a65c7ad5a4de1caa18b78dd365b889bf6b32801d7c30d7de02f105be38a3b4111cf83b792
+  data.tar.gz: c72397f42ef4a4f95a053557bf8971e3eeff78994b21ccdc232638ef1847c08e7e1c8e9e33f6055725c9fbc57755de85d474cf6063094ec6e33e211a93ba14d4

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,25 @@
+# 5.2.1 (Dec 8, 2021)
+
+* Handle the `OPERATION_TOO_LARGE` error returned by Salesforce (@timrogers)
+* Handle the `INVALID_SIGNUP_COUNTRY` error returned by Salesforce (@timrogers)
+
+## 5.2.0 (Oct 15, 2021)
+
+* Add support for Salesforce's Composite API and Composite Batch API (@meenie, @amacdougall)
+* Improve the performance of counting numbers of query results with `Restforce::Collection#count`, avoiding unnecessary API requests (@jhass)
+
+## 5.1.1 (Oct 13, 2021)
+
+* Handle the `INVALID_REPLICATION_DATE` error returned by Salesforce (@michaelwnyc)
+* Handle the `BIG_OBJECT_UNSUPPORTED_OPERATION` error returned by Salesforce (@remon)
+
+## 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.23.0'
+gem 'simplecov', '~> 0.21.2'
+gem 'webmock', '~> 3.14.0'

data/README.md

@@ -12,6 +12,8 @@ Features include:
 * Support for parent-to-child relationships.
 * Support for aggregate queries.
 * Support for the [Streaming API](#streaming)
+* Support for the [Composite API](#composite-api)
+* Support for the [Composite Batch API](#composite-batch-api)
 * Support for the GetUpdated API
 * Support for blob data types.
 * Support for GZIP compression.
@@ -25,7 +27,7 @@ Features include:
 
 Add this line to your application's Gemfile:
 
-    gem 'restforce', '~> 5.0.6'
+    gem 'restforce', '~> 5.2.1'
 
 And then execute:
 
@@ -35,8 +37,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.1.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 +462,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 +480,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)_
 
 * * *
 
@@ -572,6 +575,52 @@ end
 Boom, you're now receiving push notifications when Accounts are
 created/updated.
 
+#### Composite API
+
+Restforce supports the [Composite API](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_composite.htm).
+This feature permits the user to send a composite object—that is, a complex
+object with nested children—in a single API call. Up to 25 requests may be
+included in a single composite.
+
+Note that `GET` is not yet implemented for this API.
+
+```ruby
+# build up an array of requests:
+requests << {
+  method: :update,
+  sobject: sobject, # e.g. "Contact"
+  reference_id: reference_id,
+  data: data
+}
+
+# send every 25 requests as a subrequest in a single composite call
+requests.each_slice(25).map do |req_slice|
+  client.composite do |subrequest|
+    req_slice.each do |r|
+      subrequest.send *r.values
+    end
+  end
+end
+
+# note that we're using `map` to return an array of each responses to each
+# composite call; 100 requests will produce 4 responses
+```
+
+#### Composite Batch API
+
+Restforce supports the [Composite Batch API](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_batch.htm).
+This feature permits up to 25 subrequests in a single request, though each
+subrequest counts against the API limit. On the other hand, it has fewer
+limitations than the Composite API.
+
+```
+client.batch do |subrequests|
+  subrequests.create('Object', name: 'test')
+  subrequests.update('Object', id: '123', name: 'test')
+  subrequests.destroy('Object', '123')
+end
+```
+
 #### Replaying Events
 
 Since API version 37.0, Salesforce stores events for 24 hours and they can be

data/lib/restforce/abstract_client.rb

@@ -8,5 +8,6 @@ module Restforce
     include Restforce::Concerns::Caching
     include Restforce::Concerns::API
     include Restforce::Concerns::BatchAPI
+    include Restforce::Concerns::CompositeAPI
   end
 end

data/lib/restforce/collection.rb

@@ -27,12 +27,26 @@ module Restforce
       @raw_page['records'].size
     end
 
-    # Return the size of the Collection without making any additional requests.
+    # Return the number of items in the Collection without making any additional
+    # requests and going through all of the pages of results, one by one. Instead,
+    # we can rely on the total count of results which Salesforce returns.
     def size
       @raw_page['totalSize']
     end
     alias length size
 
+    def count(*args)
+      # By default, `Enumerable`'s `#count` uses `#each`, which means going through all
+      # of the pages of results, one by one. Instead, we can use `#size` which we have
+      # already overridden to work in a smarter, more efficient way. This only works for
+      # the simple version of `#count` with no arguments. When called with an argument or
+      # a block, you need to know what the items in the collection actually are, so we
+      # call `super` and end up iterating through each item in the collection.
+      return size unless block_given? || !args.empty?
+
+      super
+    end
+
     # Returns true if the size of the Collection is zero.
     def empty?
       size.zero?

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/concerns/composite_api.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'restforce/concerns/verbs'
+
+module Restforce
+  module Concerns
+    module CompositeAPI
+      extend Restforce::Concerns::Verbs
+
+      define_verbs :post
+
+      def composite(all_or_none: false, collate_subrequests: false)
+        subrequests = Subrequests.new(options)
+        yield(subrequests)
+
+        if subrequests.requests.length > 25
+          raise ArgumentError, 'Cannot have more than 25 subrequests.'
+        end
+
+        properties = {
+          compositeRequest: subrequests.requests,
+          allOrNone: all_or_none,
+          collateSubrequests: collate_subrequests
+        }
+        response = api_post('composite', properties.to_json)
+
+        results = response.body['CompositeResponse']
+        has_errors = results.any? { |result| result['HttpStatusCode'].digits.last == 4 }
+        if all_or_none && has_errors
+          last_error_index = results.rindex { |result| result['HttpStatusCode'] != 412 }
+          last_error = results[last_error_index]
+          raise CompositeAPIError, last_error['Body'][0]['errorCode']
+        end
+
+        results
+      end
+
+      def composite!(collate_subrequests: false, &block)
+        composite(all_or_none: true, collate_subrequests: collate_subrequests, &block)
+      end
+
+      class Subrequests
+        def initialize(options)
+          @options = options
+          @requests = []
+        end
+        attr_reader :options, :requests
+
+        def create(sobject, reference_id, attrs)
+          requests << {
+            method: 'POST',
+            url: composite_api_path(sobject),
+            body: attrs,
+            referenceId: reference_id
+          }
+        end
+
+        def update(sobject, reference_id, attrs)
+          id = attrs.fetch(attrs.keys.find { |k, _v| k.to_s.casecmp?('id') }, nil)
+          raise ArgumentError, 'Id field missing from attrs.' unless id
+
+          attrs_without_id = attrs.reject { |k, _v| k.to_s.casecmp?('id') }
+          requests << {
+            method: 'PATCH',
+            url: composite_api_path("#{sobject}/#{id}"),
+            body: attrs_without_id,
+            referenceId: reference_id
+          }
+        end
+
+        def destroy(sobject, reference_id, id)
+          requests << {
+            method: 'DELETE',
+            url: composite_api_path("#{sobject}/#{id}"),
+            referenceId: reference_id
+          }
+        end
+
+        def upsert(sobject, reference_id, ext_field, attrs)
+          raise ArgumentError, 'External id field missing.' unless ext_field
+
+          ext_id = attrs.fetch(attrs.keys.find do |k, _v|
+            k.to_s.casecmp?(ext_field.to_s)
+          end, nil)
+          raise ArgumentError, 'External id missing from attrs.' unless ext_id
+
+          attrs_without_ext_id = attrs.reject { |k, _v| k.to_s.casecmp?(ext_field) }
+          requests << {
+            method: 'PATCH',
+            url: composite_api_path("#{sobject}/#{ext_field}/#{ext_id}"),
+            body: attrs_without_ext_id,
+            referenceId: reference_id
+          }
+        end
+
+        private
+
+        def composite_api_path(path)
+          "/services/data/v#{options[:api_version]}/sobjects/#{path}"
+        end
+      end
+    end
+  end
+end

data/lib/restforce/concerns/picklists.rb

@@ -85,7 +85,7 @@ module Restforce
         def valid?(picklist_entry)
           valid_for = picklist_entry['validFor'].ljust(16, 'A').unpack1('m').
                       unpack('C*')
-          (valid_for[index >> 3] & (0x80 >> index % 8)).positive?
+          (valid_for[index >> 3] & (0x80 >> (index % 8))).positive?
         end
       end
     end

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
@@ -31,6 +31,8 @@ module Restforce
 
     class BccSelfNotAllowedIfBccComplianceEnabled < ResponseError; end
 
+    class BigObjectUnsupportedOperation < ResponseError; end
+
     class CannotCascadeProductActive < ResponseError; end
 
     class CannotChangeFieldTypeOfApexReferencedField < ResponseError; end
@@ -237,10 +239,14 @@ module Restforce
 
     class InvalidReadOnlyUserDml < ResponseError; end
 
+    class InvalidReplicationDate < ResponseError; end
+
     class InvalidSaveAsActivityFlag < ResponseError; end
 
     class InvalidSessionId < ResponseError; end
 
+    class InvalidSignupCountry < ResponseError; end
+
     class InvalidStatus < ResponseError; end
 
     class InvalidType < ResponseError; end
@@ -327,6 +333,8 @@ module Restforce
 
     class OpWithInvalidUserTypeException < ResponseError; end
 
+    class OperationTooLarge < ResponseError; end
+
     class OptedOutOfMassMail < ResponseError; end
 
     class PackageLicenseRequired < ResponseError; end
@@ -341,6 +349,8 @@ module Restforce
 
     class PrivateContactOnAsset < ResponseError; end
 
+    class QueryTimeout < ResponseError; end
+
     class RecordInUseByWorkflow < ResponseError; end
 
     class RequestLimitExceeded < ResponseError; end
@@ -411,6 +421,7 @@ module Restforce
    BccNotAllowedIfBccComplianceEnabled,
       "BCC_SELF_NOT_ALLOWED_IF_BCC_COMPLIANCE_ENABLED" =>
    BccSelfNotAllowedIfBccComplianceEnabled,
+      "BIG_OBJECT_UNSUPPORTED_OPERATION" => BigObjectUnsupportedOperation,
       "CANNOT_CASCADE_PRODUCT_ACTIVE" => CannotCascadeProductActive,
       "CANNOT_CHANGE_FIELD_TYPE_OF_APEX_REFERENCED_FIELD" =>
    CannotChangeFieldTypeOfApexReferencedField,
@@ -521,8 +532,10 @@ module Restforce
       "INVALID_PARTNER_NETWORK_STATUS" => InvalidPartnerNetworkStatus,
       "INVALID_PERSON_ACCOUNT_OPERATION" => InvalidPersonAccountOperation,
       "INVALID_READ_ONLY_USER_DML" => InvalidReadOnlyUserDml,
+      "INVALID_REPLICATION_DATE" => InvalidReplicationDate,
       "INVALID_SAVE_AS_ACTIVITY_FLAG" => InvalidSaveAsActivityFlag,
       "INVALID_SESSION_ID" => InvalidSessionId,
+      "INVALID_SIGNUP_COUNTRY" => InvalidSignupCountry,
       "INVALID_STATUS" => InvalidStatus,
       "INVALID_TYPE" => InvalidType,
       "INVALID_TYPE_FOR_OPERATION" => InvalidTypeForOperation,
@@ -566,6 +579,7 @@ module Restforce
       "NUMBER_OUTSIDE_VALID_RANGE" => NumberOutsideValidRange,
       "NUM_HISTORY_FIELDS_BY_SOBJECT_EXCEEDED" => NumHistoryFieldsBySobjectExceeded,
       "OP_WITH_INVALID_USER_TYPE_EXCEPTION" => OpWithInvalidUserTypeException,
+      "OPERATION_TOO_LARGE" => OperationTooLarge,
       "OPTED_OUT_OF_MASS_MAIL" => OptedOutOfMassMail,
       "PACKAGE_LICENSE_REQUIRED" => PackageLicenseRequired,
       "PLATFORM_EVENT_ENCRYPTION_ERROR" => PlatformEventEncryptionError,
@@ -573,6 +587,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 +621,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 +633,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.2.1'
 end

data/lib/restforce.rb

@@ -32,6 +32,7 @@ module Restforce
     autoload :Base,           'restforce/concerns/base'
     autoload :API,            'restforce/concerns/api'
     autoload :BatchAPI,       'restforce/concerns/batch_api'
+    autoload :CompositeAPI,   'restforce/concerns/composite_api'
   end
 
   module Data
@@ -48,6 +49,7 @@ module Restforce
   UnauthorizedError   = Class.new(Faraday::ClientError)
   APIVersionError     = Class.new(Error)
   BatchAPIError       = Class.new(Error)
+  CompositeAPIError   = Class.new(Error)
 
   # Inherit from Faraday::ResourceNotFound for backwards-compatibility
   # Consumers of this library that rescue and handle Faraday::ResourceNotFound

data/restforce.gemspec

@@ -19,23 +19,14 @@ Gem::Specification.new do |gem|
 
   gem.metadata = {
     'source_code_uri' => 'https://github.com/restforce/restforce',
-    'changelog_uri'   => 'https://github.com/restforce/restforce/blob/master/CHANGELOG.md'
+    'changelog_uri'   => 'https://github.com/restforce/restforce/blob/master/CHANGELOG.md',
+'rubygems_mfa_required' => 'true'
   }
 
-  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 'hashie', '>= 1.2.0', '< 6.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'
 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