restforce 5.0.6 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6644bf699621fb5414dce1dce275e5a265fca50305bcfca98864b6c1683f1687
-  data.tar.gz: 5ef0177a3a91dbe1637fc493b7f0bc478fca34c49e392abb1eccdf8bf951aa66
+  metadata.gz: 5b88661434383f16571c2b240a9c2482035058a34adadfe39a86b4fecb7382ca
+  data.tar.gz: bb4ac026f9b7fbd43f7b5237760e341d9d351c5433ca19009daa24794be251f0
 SHA512:
-  metadata.gz: 7c7d3e8b58743f8d4ae6ae9255c2d89cc78b06a5e963350784ff3c884396bf1ef03fb986f2aba7bd231d8ae9af2f0b2af78a77c98fcb62356ac09b1411753e13
-  data.tar.gz: 5c8bb85fdcd28e5eba8d0939ef1868d42b99d079cddd056941ec7c4cf591d3789caa2b569cafeb8415a89755e567de1a93486dc9c18c5507275adad5631374cc
+  metadata.gz: da66afd00a69c078e3883f76ae0039d2742911de7b0ca8cb6b14b15801695973a25deec7e71fede838d9193a60224510eee625b72b06c827d6f0467111757023
+  data.tar.gz: 86cad2e9fecc5610dae221bdec91a8a1868b9333d7aa552b5fb21af928352c73cad50ea64f63f26cd61ea50048784f5c3dad20b04d798c70aee2f0295c1721bd

data/.github/dependabot.yml

@@ -4,16 +4,7 @@ updates:
   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
+- package-ecosystem: 'github-actions'
+  directory: '/'
+  schedule:
+    interval: 'daily'

data/.github/funding.yml

@@ -0,0 +1 @@
+github: [restforce]

data/.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: 'Build'
+on: push
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby_version: ['2.7', '3.0', '3.1', '3.2']
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby_version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Lint Ruby files
+        run: bundle exec rubocop
+      - name: Run RSpec tests
+        run: bundle exec rspec

data/.github/workflows/faraday.yml

@@ -0,0 +1,27 @@
+name: 'Test against supported Faraday minor versions'
+on: push
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # Normally, we only test the most recent patch version for any given minor version.
+        # For v2.0.x, we test v2.0.0 and v2.0.1 because v2.0.0 has a special behaviour where
+        # the Net::HTTP adapter is not included. See
+        # https://github.com/lostisland/faraday/blob/main/UPGRADING.md#faraday-20.
+        faraday_version: ['1.1.0', '1.2.0', '1.3.1', '1.4.1', '1.5.1', '1.6.0', '1.7.2', '1.8.0', '1.9.3', '1.10.0', '2.0.0', '2.0.1', '2.1.0', '2.2.0', '2.3.0', '2.4.0', '2.5.0', '2.6.0', '2.7.0']
+    env:
+      FARADAY_VERSION: ~> ${{ matrix.faraday_version }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: 3.1
+      - name: Install dependencies
+        run: bundle install
+      - name: Run RSpec tests
+        run: bundle exec rspec

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - .*/**/*
     - vendor/**/*
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 # 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,71 @@
+# 6.2.1 (Jan 18 2023)
+
+* When a response claims to be gzipped but isn't, return the body as it is and don't explode (@timrogers)
+
+# 6.2.0 (Jan 18 2023)
+
+* Add support for `faraday` v2.7.x (@timrogers)
+* Expose the Faraday `Response` on `CompositeAPIError`s (@shravan097)
+
+# 6.1.0 (Nov 18 2022)
+
+* Add support for `faraday` v2.5.x and v2.6.x (@marcrohloff, @timrogers)
+
+# 6.0.0 (Sep 9 2022)
+
+__This version contains breaking changes. For help with upgrading, see [`UPGRADING.md`](https://github.com/restforce/restforce/blob/main/UPGRADING.md).__
+
+* __⚠️  Drop support for Ruby 2.6__, since [Ruby 2.6 has reached its end-of-life](https://www.ruby-lang.org/en/downloads/) (@timrogers)
+* __⚠️  Drop compatability with `faraday` versions before `v1.1.0`__ (@timrogers)
+* Add support for `faraday` versions `v2.0.0` onwards (@timrogers)
+
+*This version was also released as [`v6.0.0.rc.1`](https://github.com/restforce/restforce/releases/tag/v6.0.0.rc.1) on Aug 4 2022.*
+
+# 5.3.1 (Jul 19 2022)
+
+* Handle the `EXCEEDED_ID_LIMIT` error returned by the Salesforce API (@timrogers, @yashshah1)
+
+# 5.3.0 (May 30, 2022)
+
+* Add support for Faraday v1.9.x and v1.10.0 (@magni-, @timrogers)
+* Follow redirects during authentication to support Lightning URLs (e.g. `*.lightning.force.com` instead of `*.my.salesforce.com`) (@nhocki)
+
+# 5.2.4 (Mar 16, 2022)
+
+* Fix `Restforce::Collection#size` for Salesforce APIs that use the `size` property to return the total number of results, instead of `totalSize` (@kwong-yw)
+
+# 5.2.3 (Jan 17, 2022)
+
+* Add official support for Ruby 3.1 (@timrogers)
+* Fix handling of responses from the Composite API (@robob27)
+* Fix dependencies to correctly declare that the gem doesn't work with [faraday](https://github.com/lostisland/faraday) `v1.9.0` or later (@timrogers)
+
+# 5.2.2 (Dec 16, 2021)
+
+* Handle the `MALFORMED_SEARCH` error returned by Salesforce (@timrogers)
+
+# 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,20 @@
 source 'https://rubygems.org'
 gemspec
 
+faraday_version = ENV.fetch('FARADAY_VERSION', '~> 2.7.3')
+
+# Enable us to explicitly pick a Faraday version when running tests
+gem 'faraday', faraday_version
+gem 'faraday-typhoeus', '~> 0.2.1' unless faraday_version.start_with?("~> 1")
+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.12.0'
+gem 'rspec-collection_matchers', '~> 1.2.0'
+gem 'rspec-its', '~> 1.3.0'
+gem 'rspec_junit_formatter', '~> 0.6.0'
+gem 'rubocop', '~> 1.43.0'
+gem 'simplecov', '~> 0.22.0'
+gem 'webmock', '~> 3.18.1'

data/README.md

@@ -1,7 +1,7 @@
 # Restforce
 
-[![CircleCI](https://circleci.com/gh/restforce/restforce.svg?style=svg)](https://circleci.com/gh/restforce/restforce) [![Code Climate](https://codeclimate.com/github/restforce/restforce.png)](https://codeclimate.com/github/restforce/restforce) [![Dependency Status](https://gemnasium.com/restforce/restforce.png)](https://gemnasium.com/restforce/restforce)
-![](https://img.shields.io/gem/dt/restforce.svg)
+[![CircleCI](https://circleci.com/gh/restforce/restforce.svg?style=svg)](https://circleci.com/gh/restforce/restforce)
+![Downloads](https://img.shields.io/gem/dt/restforce.svg)
 
 Restforce is a ruby gem for the [Salesforce REST api](http://www.salesforce.com/us/developer/docs/api_rest/index.htm).
 
@@ -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', '~> 6.2.1'
 
 And then execute:
 
@@ -35,8 +37,10 @@ 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 6.0.0, this gem is only compatible with Ruby 2.7.0 and later.__ If you're using an earlier Ruby version:
 
+* for Ruby 2.6, use version 5.3.1 or earlier
+* 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
@@ -147,6 +151,8 @@ export SALESFORCE_API_VERSION="41.0"
 client = Restforce.new
 ```
 
+**Note:** Restforce library does not cache JWT Bearer tokens automatically. This means that every instantiation of the Restforce class will be treated as a new login by Salesforce. Remember that Salesforce enforces [rate limits on login requests](https://help.salesforce.com/s/articleView?id=000312767&type=1). If you are building an application that will instantiate the Restforce class more than this specified rate limit, you might want to consider caching the Bearer token either in-memory or in your own storage by leveraging the `authentication_callback` method. 
+
 #### Sandbox Organizations
 
 You can connect to sandbox organizations by specifying a host. The default host is
@@ -188,7 +194,7 @@ end
 
 By default, the gem defaults to using Version 26.0 (Winter '13) of the Salesforce API. This maintains backwards compatibility for existing users.
 
-__We strongly suggest configuring Restforce to use the most recent API version, currently Version 41.0 (Winter '18) to get the best Salesforce API experience__ - for example, some more recently-added API endpoints will not be available without moving to a more recent
+__We strongly suggest configuring Restforce to use the [most recent API version](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_versions.htm), to get the best Salesforce API experience__ - for example, some more recently-added API endpoints will not be available without moving to a more recent
 version. If you're trying to use a method that is unavailable with your API version,
 Restforce will raise an `APIVersionError`.
 
@@ -290,6 +296,8 @@ client.find('Account', '1234', 'Some_External_Id_Field__c')
 # => #<Restforce::SObject Id="001D000000INjVe" Name="Test" LastModifiedBy="005G0000002f8FHIAY" ... >
 ```
 
+`find` raises an error if nothing is found.
+
 ### select
 
 `select` allows the fetching of a specific list of fields from a single object.  It requires an `external_id` lookup, but is often much faster than an arbitrary query.
@@ -459,7 +467,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 +485,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 +580,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/UPGRADING.md

@@ -1,3 +1,32 @@
+# Upgrading from Restforce 5.x to 6.x
+
+__There are two breaking changes introduced in Restforce 6.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.
+
+## Versions of `faraday` before `v1.1.0` are no longer supported
+
+__Likelyhood of impact__: Moderate
+
+Restforce uses a gem called [`faraday`](https://github.com/lostisland/faraday) to make HTTP requests to Salesforce. 
+
+Up until now, Restforce has supported Faraday versions between v0.9.0 and v1.10.0. 
+
+In Restforce 6.x, we drop support for Faraday versions before v1.1.0, and add support for Faraday v2.x.
+
+This will allow you to use the latest versions of Faraday and benefit from security patches, new features, etc., but you may need to adapt your code. The impact of this change will depend on your project:
+
+* If Restforce is the only part of your project using Faraday - that is, your own code doesn't use Faraday and none of your other gems use Faraday - then you shouldn't need to do anything special. Just upgrade Restforce, and everything should be handled automatically.
+* If your own code uses Faraday or another gem you use depends on Faraday, and you're currently using a Faraday version before v1.1.0, you will need to upgrade your Faraday version. If possible, you should upgrade to the latest version (v2.4.0 at the time of writing). This may require you to adapt your code (see [here](https://github.com/lostisland/faraday/blob/main/UPGRADING.md) for Faraday's instructions) or upgrade other gems you depend on.
+
+## Ruby 2.6 is no longer supported
+
+__Likelyhood of impact__: Moderate
+
+Ruby 2.6 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.6 and earlier in the Restforce library. The gemspec now specifies that only 2.7 onwards is supported, and this will be enforced by RubyGems.
+
+Before you update to Restforce 6.x, you'll need to switch to Ruby 2.7 or later. The current version of Ruby at the time of wriing is 3.1.
+
 # 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.

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,30 @@ 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.
+    #
+    # Most of the Salesforce API returns this in the `totalSize` attribute. For
+    # some reason, the [List View Results](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_listviewresults.htm)
+    # endpoint (and maybe others?!) uses the `size` attribute.
     def size
-      @raw_page['totalSize']
+      @raw_page['totalSize'] || @raw_page['size']
     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
@@ -429,6 +429,7 @@ module Restforce
       # field   - External ID field to use (default: nil).
       #
       # Returns the Restforce::SObject sobject record.
+      # Raises NotFoundError if nothing is found.
       def find(sobject, id, field = nil)
         url = if field
                 "sobjects/#{sobject}/#{field}/#{ERB::Util.url_encode(id)}"

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 = Restforce.configuration.options.map do |option|
+        @options = Restforce.configuration.options.to_h do |option|
           [option, Restforce.configuration.send(option)]
-        end.to_h
+        end
 
         @options.merge! opts
         yield builder if block_given?

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.new(last_error['body'][0]['errorCode'], response)
+        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/connection.rb

@@ -43,7 +43,7 @@ module Restforce
           # Caches GET requests.
           builder.use Restforce::Middleware::Caching, cache, options if cache
           # Follows 30x redirects.
-          builder.use FaradayMiddleware::FollowRedirects
+          builder.use Faraday::FollowRedirects::Middleware
           # Raises errors for 40x responses.
           builder.use Restforce::Middleware::RaiseError
           # Parses returned JSON response into a hash.

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/config.rb

@@ -91,29 +91,31 @@ module Restforce
       end
     end
 
-    option :api_version, default: lambda { ENV['SALESFORCE_API_VERSION'] || '26.0' }
+    option :api_version, default: lambda { ENV.fetch('SALESFORCE_API_VERSION', '26.0') }
 
     # The username to use during login.
-    option :username, default: lambda { ENV['SALESFORCE_USERNAME'] }
+    option :username, default: lambda { ENV.fetch('SALESFORCE_USERNAME', nil) }
 
     # The password to use during login.
-    option :password, default: lambda { ENV['SALESFORCE_PASSWORD'] }
+    option :password, default: lambda { ENV.fetch('SALESFORCE_PASSWORD', nil) }
 
     # The security token to use during login.
-    option :security_token, default: lambda { ENV['SALESFORCE_SECURITY_TOKEN'] }
+    option :security_token, default: lambda {
+                                       ENV.fetch('SALESFORCE_SECURITY_TOKEN', nil)
+                                     }
 
     # The OAuth client id
-    option :client_id, default: lambda { ENV['SALESFORCE_CLIENT_ID'] }
+    option :client_id, default: lambda { ENV.fetch('SALESFORCE_CLIENT_ID', nil) }
 
     # The OAuth client secret
-    option :client_secret, default: lambda { ENV['SALESFORCE_CLIENT_SECRET'] }
+    option :client_secret, default: lambda { ENV.fetch('SALESFORCE_CLIENT_SECRET', nil) }
 
     # The private key for JWT authentication
     option :jwt_key
 
-    # Set this to true if you're authenticating with a Sandbox instance.
-    # Defaults to false.
-    option :host, default: lambda { ENV['SALESFORCE_HOST'] || 'login.salesforce.com' }
+    # The login host.
+    # Defaults to login.salesforce.com.
+    option :host, default: lambda { ENV.fetch('SALESFORCE_HOST', 'login.salesforce.com') }
 
     option :oauth_token
     option :refresh_token
@@ -139,7 +141,7 @@ module Restforce
     # Faraday adapter to use. Defaults to Faraday.default_adapter.
     option :adapter, default: lambda { Faraday.default_adapter }
 
-    option :proxy_uri, default: lambda { ENV['SALESFORCE_PROXY_URI'] }
+    option :proxy_uri, default: lambda { ENV.fetch('SALESFORCE_PROXY_URI', nil) }
 
     # A Proc that is called with the response body after a successful authentication.
     option :authentication_callback