restforce 4.2.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4f7647ad705f0f4eac359a3b1e792ab4603e9ae4d177570e9369734f7ff3356
-  data.tar.gz: 7fc076cb9239ebd513926e068d5d1e4ebec01cbb5245e919fd165ea5bf7b841c
+  metadata.gz: f30c54c95fc530b6278faf751728b2793971c8aa0e43862f6719753a1d62d4fa
+  data.tar.gz: c7ac3a654170e2cb883325b12f4e6315d0c0423f9673142c93c87cf5de2003b8
 SHA512:
-  metadata.gz: ad1cfc119e9d3a64d5491c667254647a1e79298bebb7c036dee95f87b2a6823f0ed5fbb862dc29c6d25166399042767ecae5520498726fa4025b99b439bcd9f1
-  data.tar.gz: f8e0ab3e2cc1e74e4a1d8d50da2ca8b5bcb13436765993c8737582703248c1c47ca2c6ff02430f19390c02f1b5d95960e6d40e5510ef53e5b25d4e61add35ecc
+  metadata.gz: 4a731ebfe6e755b66479f8e85434a017d50a81c084f048e1454f3714bb047c36f8362976c904a91890b8f62099a3238689fe93f200468670b8f4dafc51cb5aa5
+  data.tar.gz: f5e8cd87fc4eccd486828627dfa1c769107e5869f7cf60088d5c7ee2cde2207d9bf33794a4f1639b98cfccfee54734d583dcbdbea8d841442a7086ff00b9e315

data/.circleci/config.yml

@@ -34,23 +34,23 @@ references:
         destination: test-results
 
 jobs:
-  build-ruby265:
+  build-ruby30:
     docker:
-       - image: circleci/ruby:2.6.5
+       - image: circleci/ruby:3.0
     steps: *steps
-  build-ruby257:
+  build-ruby27:
     docker:
-       - image: circleci/ruby:2.5.7
+       - image: circleci/ruby:2.7
     steps: *steps
-  build-ruby249:
+  build-ruby26:
     docker:
-       - image: circleci/ruby:2.4.9
+       - image: circleci/ruby:2.6
     steps: *steps
 
 workflows:
   version: 2
   tests:
     jobs:
-      - build-ruby265
-      - build-ruby257
-      - build-ruby249
+      - build-ruby30
+      - build-ruby27
+      - build-ruby26

data/.github/ISSUE_TEMPLATE/unhandled-salesforce-error.md

@@ -0,0 +1,17 @@
+---
+name: Unhandled Salesforce error
+about: We've recently changed the way we handle Salesforce errors to define them ahead
+  of time, rather than dynamically. This might mean we're missing some errors. Please
+  use this template to report them.
+title: 'Unhandled Salesforce error: <insert error code here>'
+labels: bug
+assignees: timrogers
+
+---
+
+Restforce doesn't have a definition for the error code `INSERT ERROR CODE HERE`.
+
+I discovered this missing error code because:
+
+- [ ] I tried to `rescue` it or refer to it in my code
+- [ ] I got this error back from Salesforce

data/.github/dependabot.yml

@@ -0,0 +1,19 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - 1.10.0
+    - 1.11.0
+    - 1.12.0
+    - 1.12.1
+    - 1.9.0
+  - dependency-name: webmock
+    versions:
+    - 3.12.0
+    - 3.12.1

data/.rubocop.yml

@@ -7,10 +7,11 @@ AllCops:
   Exclude:
     - .*/**/*
     - vendor/**/*
-  TargetRubyVersion: 2.4
+  NewCops: enable
+  TargetRubyVersion: 2.6
 
-# Limit lines to 80 characters.
-Metrics/LineLength:
+# Limit lines to 90 characters.
+Layout/LineLength:
   Max: 90
 
 Metrics/ClassLength:
@@ -70,4 +71,4 @@ Naming/FileName:
     - Guardfile
 
 Lint/UriEscapeUnescape:
-  Enabled: false
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,80 @@
+## 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)
+* Handle the `METHOD_NOT_ALLOWED` error returned by Salesforce (@timrogers)
+* Handle the `APEX_ERROR` error returned by Salesforce (@timrogers)
+
+## 5.0.5 (Feb 17, 2021)
+
+* Handle the `CANNOT_EXECUTE_FLOW_TRIGGER` error returned by Salesforce (@almusavi, @timrogers)
+
+## 5.0.4 (Jan 18, 2021)
+
+* Handle the `INVALID_QUERY_LOCATOR` error returned by Salesforce
+* Handle the `INVALID_OPERATION_WITH_EXPIRED_PASSWORD` error returned by Salesforce
+* Handle the `FIELD_INTEGRITY_EXCEPTION` error returned by Salesforce
+* Handle the `FORBIDDEN` error returned by Salesforce
+* Handle the `ILLEGAL_QUERY_PARAMETER_VALUE` error returned by Salesforce
+* Handle the `JSON_PARSER_ERROR` error returned by Salesforce
+
+## 5.0.3 (Sep 8, 2020)
+
+* Handle the undocumented `EXCEEDED_MAX_SEMIJOIN_SUBSELECTS` error returned by Salesforce (@embertel, @timrogers)
+
+## 5.0.2 (Sep 6, 2020)
+
+* Handle the undocumented `REQUEST_LIMIT_EXCEEDED` error returned by Salesforce (@wkirkby, @timrogers)
+* Handle the undocumented `SERVER_UNAVAILABLE` error returned by Salesforce (@wkirkby, @timrogers)
+* Refactor the library to be compatible with Rubocop 0.90's cops (this shouldn't introduce any noticeable changes see #569 for detailed changes) (@timrogers)
+
+## 5.0.1 (Aug 13, 2020)
+
+* Handle the undocumented `API_CURRENTLY_DISABLED` error returned by Salesforce (@ruipserra, @timrogers)
+* Handle the undocumented `MALFORMED_QUERY` error returned by Salesforce (@scottserok, @timrogers)
+* Handle the undocumented `INVALID_QUERY_FILTER_OPERATOR` error returned by Salesforce (@Dantemss, @timrogers)
+* Add documentation and scripts for running the
+library's tests using Docker (@ryansch)
+
+## 5.0.0 (Jul 10, 2020)
+
+For instructions on upgrading from Restforce 4.x to 5.x, see our ["Upgrading from Restforce 4.x to 5.x"](https://github.com/restforce/restforce/blob/master/UPGRADING.md) guide.
+
+### Breaking changes 
+
+* __⚠️  Define exception classes for Salesforce errors up-front instead of dynamically at runtime__, *running the risk that we might miss some errors which should be defined*. If any errors are missed, they will be added in patch versions (e.g. `5.0.1`). For more details on this change, see the ["Upgrading from Restforce 4.x to 5.x"](https://github.com/restforce/restforce/blob/master/UPGRADING.md) guide (@presidentbeef, @timrogers).
+* __⚠️  Deprecate support for Ruby 2.4__, since [Ruby 2.4 reached its end-of-life](https://www.ruby-lang.org/en/news/2020/04/05/support-of-ruby-2-4-has-ended/) in April 2020 (@timrogers)
+* __⚠️  Change the ancestry of `Restforce::UnauthorizedError` so it inherits from `Faraday::ClientError`, not `Restforce::Error`__. This breaking change was required to expose the response body returned by the API as part of this error - see the non-breaking changes entry below for further details (@michaldbianchi).
+
+### Non-breaking changes
+
+* Add support for `lostisland/faraday` v1.x, whilst maintaining support for v0.9.x (@ryansch)
+* Add `#empty?` method to `Restforce::Collection`, returning whether they are any items in a collection (@bubaflub)
+* Allow opting-in to caching on a per-call basis with `Restforce::Client#with_caching` (@swaincreates)
+* Expose the response body from Salesforce on `Restforce::UnauthorizedError` and `Restforce::NotFoundError` (@michaeldbianchi)
+* Remove the unnecessary depending on the `json` gem, which has been part of the Ruby standard library since v1.9 (@vonTronje)
+
+
+## 4.2.2 (Jan 23, 2020)
+
+* Fix `NoMethodError: undefined method '[]' for nil:NilClass` error when generating objects to return (@apurkiss)
+
 ## 4.2.1 (Dec 4, 2019)
 
 * Handle empty response bodies returned with authentication errors (@sylvandor)

data/CONTRIBUTING.md

@@ -34,4 +34,24 @@ Some things that will increase the chance that your pull request is accepted:
 * Write tests.
 * Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 
-*Adapted from [factory_girl_rails's CONTRIBUTING.md](https://github.com/thoughtbot/factory_girl_rails/blob/master/CONTRIBUTING.md).*
+*Adapted from [factory_bot_rails's CONTRIBUTING.md](https://github.com/thoughtbot/factory_bot_rails/blob/master/CONTRIBUTING.md).*
+
+## Docker
+
+If you'd rather use a docker container to run the tests, you can use the following instructions.
+
+To set up the container image:
+
+`docker-compose build --pull`
+
+To run specs:
+
+`docker-compose run --rm restforce rspec`
+
+To run rubocop:
+
+`docker-compose run --rm restforce rubocop`
+
+To reset the bundler cache:
+
+`docker-compose down -v`

data/Dockerfile

@@ -0,0 +1,31 @@
+FROM ruby:2.6.5-alpine
+
+RUN apk add --no-cache \
+  ca-certificates \
+  wget \
+  openssl \ 
+  bash \
+  build-base \
+  git \
+  sqlite-dev \
+  tzdata \
+  tini
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ENV BUNDLER_VERSION 2.1.4
+RUN gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force
+
+WORKDIR /srv
+
+COPY Gemfile restforce.gemspec /srv/
+COPY lib/restforce/version.rb /srv/lib/restforce/version.rb
+
+RUN bundle install
+
+COPY . /srv/
+
+ENTRYPOINT ["/sbin/tini", "-g", "--", "bundle", "exec"]
+CMD ["rspec"]

data/Gemfile

@@ -3,12 +3,15 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'faraday', '~> 0.17.0'
+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.22.1'
+gem 'simplecov', '~> 0.21.2'
+gem 'webmock', '~> 3.14.0'

data/README.md

@@ -8,10 +8,12 @@ Restforce is a ruby gem for the [Salesforce REST api](http://www.salesforce.com/
 Features include:
 
 * A clean and modular architecture using [Faraday middleware](https://github.com/technoweenie/faraday) and [Hashie::Mash](https://github.com/intridea/hashie/tree/v1.2.0)'d responses.
-* Support for interacting with multiple users from different orgs.
+* Support for interacting with multiple users from different organizations.
 * 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.
@@ -19,13 +21,13 @@ Features include:
 * Support for dependent picklists.
 * Support for decoding [Force.com Canvas](http://www.salesforce.com/us/developer/docs/platform_connectpre/canvas_framework.pdf) signed requests. (NEW!)
 
-[Official Website](http://restforce.org/) | [Documentation](http://rubydoc.info/gems/restforce/frames) | [Changelog](https://github.com/restforce/restforce/tree/master/CHANGELOG.md)
+[Official Website](https://restforce.github.io/) | [Documentation](http://rubydoc.info/gems/restforce/frames) | [Changelog](https://github.com/restforce/restforce/tree/master/CHANGELOG.md)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'restforce', '~> 4.2.0'
+    gem 'restforce', '~> 5.2.0'
 
 And then execute:
 
@@ -35,7 +37,13 @@ Or install it yourself as:
 
     $ gem install restforce
 
-__As of [version 4.0.0](https://github.com/restforce/restforce/blob/master/CHANGELOG.md#400-oct-9-2019), this gem is only compatible with Ruby 2.4.0 and later.__ You'll need to use version 3.2.0 or earlier if you're running on Ruby 2.3. If you're running on Ruby 2.2, 2.1 or 2.0, use version 2.5.3 or earlier. For Ruby 1.9.3, you'll need to manually specify that you wish to use version 2.4.2.
+__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
+* for Ruby 1.9.3, use version 2.4.2
 
 This gem is versioned using [Semantic Versioning](http://semver.org/), so you can be confident when updating that there will not be breaking changes outside of a major version (following format MAJOR.MINOR.PATCH, so for instance moving from 3.1.0 to 4.0.0 would be allowed to include incompatible API changes). See the [changelog](https://github.com/restforce/restforce/tree/master/CHANGELOG.md) for details on what has changed in each version.
 
@@ -48,7 +56,7 @@ so you can do things like `client.query('select Id, (select Name from Children__
 ### Initialization
 
 Which authentication method you use really depends on your use case. If you're
-building an application where many users from different orgs are authenticated
+building an application where many users from different organizations are authenticated
 through oauth and you need to interact with data in their org on their behalf,
 you should use the OAuth token authentication method.
 
@@ -78,7 +86,7 @@ client = Restforce.new(oauth_token: 'access_token',
                        api_version: '41.0')
 ```
 
-The middleware will use the `refresh_token` automatically to acquire a new `access_token` if the existing `access_token` is invalid.
+The middleware will use the `refresh_token` automatically to acquire a new `access_token` if the existing `access_token` is invalid. The refresh process uses the `host` option so make sure that is set correctly for sandbox organizations.
 
 `authentication_callback` is a proc that handles the response from Salesforce when the `refresh_token` is used to obtain a new `access_token`. This allows the `access_token` to be saved for re-use later - otherwise subsequent API calls will continue the cycle of "auth failure/issue new access_token/auth success".
 
@@ -142,7 +150,17 @@ export SALESFORCE_API_VERSION="41.0"
 client = Restforce.new
 ```
 
-### Proxy Support
+#### Sandbox Organizations
+
+You can connect to sandbox organizations by specifying a host. The default host is
+'login.salesforce.com':
+
+```ruby
+client = Restforce.new(host: 'test.salesforce.com')
+```
+The host can also be set with the environment variable `SALESFORCE_HOST`.
+
+#### Proxy Support
 
 You can specify a HTTP proxy using the `proxy_uri` option, as follows, or by setting the `SALESFORCE_PROXY_URI` environment variable:
 
@@ -158,16 +176,6 @@ client = Restforce.new(username: 'foo',
 
 You may specify a username and password for the proxy with a URL along the lines of 'http://user:password@proxy.example.com:123'.
 
-#### Sandbox Orgs
-
-You can connect to sandbox orgs by specifying a host. The default host is
-'login.salesforce.com':
-
-```ruby
-client = Restforce.new(host: 'test.salesforce.com')
-```
-The host can also be set with the environment variable `SALESFORCE_HOST`.
-
 #### Global configuration
 
 You can set any of the options passed into `Restforce.new` globally:
@@ -328,8 +336,11 @@ client.update('Account', Id: '0016000000MRatd', Name: 'Whizbang Corp')
 ```ruby
 # Update the record with external `External__c` external ID set to '12'
 client.upsert('Account', 'External__c', External__c: 12, Name: 'Foobar')
+# => true or "RecordId"
 ```
 
+The upsert method will return the record Id if included in the response body from the Salesforce API; otherwise, it returns true. Currently the Salesforce API only returns the Id for newly created records.
+
 ### destroy
 
 ```ruby
@@ -451,13 +462,13 @@ 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',
                           Description: 'Document test',
                           Name: 'My image',
-                          Body: Restforce::UploadIO.new(File.expand_path('image.jpg', __FILE__), 'image/jpeg')
+                          Body: Restforce::FilePart.new(File.expand_path('image.jpg', __FILE__), 'image/jpeg')
 ```
 
 Using base64 encoded data (37.5mb limit):
@@ -469,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)_
 
 * * *
 
@@ -564,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
@@ -688,7 +745,23 @@ client.without_caching do
 end
 ```
 
-Caching is done on based on your authentication credentials, so cached responses will not be shared between different Salesforce logins.
+If you prefer to opt in to caching on a per-request, you can do so by using .with_caching and
+setting the `use_cache` config option to false:
+
+```ruby
+Restforce.configure do |config|
+  config.cache = Rails.cache
+  config.use_cache = false
+end
+```
+
+```ruby
+client.with_caching do
+  client.query('select Id from Account')
+end
+```
+
+Caching is done based on your authentication credentials, so cached responses will not be shared between different Salesforce logins.
 
 * * *
 

data/UPGRADING.md

@@ -0,0 +1,38 @@
+# Upgrading from Restforce 4.x to 5.x
+
+__There are three breaking changes introduced in Restforce 5.x__. In this guide, you'll learn about these changes and what you should check in your code to make sure that it will work with the latest version of the library.
+
+## Error classes are now defined up-front, rather than dynamically at runtime
+
+__Likelyhood of impact__: Moderate
+
+The Salesforce REST API can return a range of `errorCode`s representing different kinds of errors. To make these easy to
+handle in your code, we want to turn these into individual, specific exception classes in the `Restforce::ErrorCode` namespace that inherit from `Restforce:: ResponseError`.
+
+Up until now, these exception classes have been defined dynamically at runtime which has some disadvantages - see the [pull request](https://github.com/restforce/restforce/pull/551) for more details.
+
+In this version, we switch to defining them up-front in the code based on a list in the Salesforce documentation. There is a risk that we might have missed some errors which should be defined. If any errors are missed, they will be added in patch versions (e.g. `5.0.1`). 
+
+If your application won't run because you are referring to an exception class that no longer exists, or you see warnings logged anywhere, please [create an issue](https://github.com/restforce/restforce/issues/new?template=unhandled-salesforce-error.md&title=Unhandled+Salesforce+error%3A+%3Cinsert+error+code+here%3E).
+
+## Ruby 2.4 is no longer supported
+
+__Likelyhood of impact__: Moderate
+
+As of [5th April 2020](https://www.ruby-lang.org/en/news/2020/04/05/support-of-ruby-2-4-has-ended/), Ruby 2.4 is no longer officially supported as an active version of the Ruby language. That means that it will not receive patches and security fixes.
+
+Accordingly, we've dropped support for Ruby 2.4 and earlier in the Restforce library. It *may* be compatible, bu we don't guarantee this or enforce it with automated tests.
+
+Before you update to Restforce 5.x, you'll need to switch to Ruby 2.5 or later. The current version of Ruby at the time of wriing is 2.7.
+
+## `Restforce::UnauthorizedError` no longer inherits from `Restforce::Error`
+
+__Likelyhood of impact__: Low
+
+Previously, the `Restforce::UnauthorizedError` returned when the library couldn't authenticate with the Salesforce API inherits from `Restforce::Error`. So, if you used `rescue Restforce::Error` in your code, you'd catch these exceptions.
+
+We've now changed this exception class to inherit from `Faraday::ClientError` which allows the response body returned from the Salesforce API to be attached to the error.
+
+If you refer to `Restforce::Error` anywhere in your code, you should check whether you also need to take into account `Restforce::UnauthorizedError`.
+
+If you refer to `Faraday::ClientError` anywhere in your code, you should check that you want the case where Restforce can't authenticate to be included.

data/docker-compose.yml

@@ -0,0 +1,7 @@
+version: "3.6"
+services:
+  restforce:
+    build: .
+    image: restforce:dev
+    volumes:
+      - .:/srv

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

@@ -12,12 +12,12 @@ module Restforce
     end
 
     # Yield each value on each page.
-    def each
+    def each(&block)
       @raw_page['records'].each { |record| yield Restforce::Mash.build(record, @client) }
 
       np = next_page
       while np
-        np.current_page.each { |record| yield record }
+        np.current_page.each(&block)
         np = np.next_page
       end
     end
@@ -27,12 +27,31 @@ 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?
+    end
+
     # Return array of the elements on the current page
     def current_page
       first(@raw_page['records'].size)

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
@@ -510,7 +510,7 @@ module Restforce
 
       # Internal: Errors that should be rescued from in non-bang methods
       def exceptions
-        [Faraday::ClientError]
+        [Faraday::Error]
       end
     end
   end

data/lib/restforce/concerns/base.rb

@@ -61,9 +61,9 @@ module Restforce
       def initialize(opts = {})
         raise ArgumentError, 'Please specify a hash of options' unless opts.is_a?(Hash)
 
-        @options = Hash[Restforce.configuration.options.map do |option|
+        @options = Restforce.configuration.options.map do |option|
           [option, Restforce.configuration.send(option)]
-        end]
+        end.to_h
 
         @options.merge! opts
         yield builder if block_given?

data/lib/restforce/concerns/caching.rb

@@ -15,6 +15,13 @@ module Restforce
         options.delete(:use_cache)
       end
 
+      def with_caching
+        options[:use_cache] = true
+        yield
+      ensure
+        options[:use_cache] = false
+      end
+
       private
 
       # Internal: Cache to use for the caching middleware