restforce 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc09f4586a150366a59119a46d6ccee41a72f6b63efa96224e7fe9bb31a65574
-  data.tar.gz: 71c415929a9ecb427cf528fbb1ac57630cb503cdad2ecd2b17769f1000b174dd
+  metadata.gz: 1a41bb3b7f6f9c7fc06a71266e685e82afae4d6e291553159a6909ed29485553
+  data.tar.gz: b7e01b436eafbd7be80dc4210fce034ff8ae08b4920241c84999b252d34501d2
 SHA512:
-  metadata.gz: ac1bd7610aec45c963fad5feac34f0f4bc0bd847bbd80bc4b2ad7895cf7a0ee35d68904419ffb5ea2b74d205a7897a06558e7661d1e03c9ed00644438047b87b
-  data.tar.gz: c3107f9a4a125e1fb89f107477eab41379a4347fce3689204e1d2dd3817a7cf0c465cfabdb25cf01246cfe428719147b7ccbba73b330d4211856712fb744a6a0
+  metadata.gz: b465fc051f6199309d6bf7c18328b6765a8c08fb24daf28e978bd478602a2b6988dbd3578c3cc6562d2b5066666fdb9ddb64b4bd9a73fe9297d5dc3a073388ca
+  data.tar.gz: b1cc8939cb52563e39959bf2df3b27d91f64dba0fc7b5afd1d80fea47a4cdc55b5c921a9eaeef39ba97923037cd9ef0a873e3eed96dca0e50581f73d6ab66f06

data/.circleci/config.yml

@@ -34,23 +34,28 @@ references:
         destination: test-results
 
 jobs:
+  build-ruby31:
+    docker:
+       - image: cimg/ruby:3.1
+    steps: *steps
   build-ruby30:
     docker:
-       - image: circleci/ruby:3.0
+       - image: cimg/ruby:3.0
     steps: *steps
   build-ruby27:
     docker:
-       - image: circleci/ruby:2.7
+       - image: cimg/ruby:2.7
     steps: *steps
   build-ruby26:
     docker:
-       - image: circleci/ruby:2.6
+       - image: cimg/ruby:2.6
     steps: *steps
 
 workflows:
   version: 2
   tests:
     jobs:
+      - build-ruby31
       - build-ruby30
       - build-ruby27
       - build-ruby26

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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)

data/Gemfile

@@ -11,7 +11,7 @@ gem 'rake'
 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 'rspec_junit_formatter', '~> 0.5.1'
+gem 'rubocop', '~> 1.24.1'
 gem 'simplecov', '~> 0.21.2'
 gem 'webmock', '~> 3.14.0'

data/README.md

@@ -27,7 +27,7 @@ Features include:
 
 Add this line to your application's Gemfile:
 
-    gem 'restforce', '~> 5.2.2'
+    gem 'restforce', '~> 5.2.3'
 
 And then execute:
 

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

@@ -24,12 +24,12 @@ module Restforce
         }
         response = api_post('composite', properties.to_json)
 
-        results = response.body['CompositeResponse']
-        has_errors = results.any? { |result| result['HttpStatusCode'].digits.last == 4 }
+        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_index = results.rindex { |result| result['httpStatusCode'] != 412 }
           last_error = results[last_error_index]
-          raise CompositeAPIError, last_error['Body'][0]['errorCode']
+          raise CompositeAPIError, last_error['body'][0]['errorCode']
         end
 
         results

data/lib/restforce/version.rb

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

data/restforce.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.6'
 
-  gem.add_dependency 'faraday', '<= 2.0', '>= 0.9.0'
+  gem.add_dependency 'faraday', '< 1.9.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']

data/spec/unit/concerns/composite_api_spec.rb

@@ -128,7 +128,7 @@ describe Restforce::Concerns::CompositeAPI do
   describe '#composite' do
     let(:method) { :composite }
     let(:all_or_none) { false }
-    let(:response) { double('Faraday::Response', body: { 'CompositeResponse' => [] }) }
+    let(:response) { double('Faraday::Response', body: { 'compositeResponse' => [] }) }
     it_behaves_like 'composite requests'
   end
 
@@ -136,7 +136,7 @@ describe Restforce::Concerns::CompositeAPI do
     let(:method) { :composite! }
     let(:all_or_none) { true }
     let(:response) do
-      double('Faraday::Response', body: { 'CompositeResponse' => [] })
+      double('Faraday::Response', body: { 'compositeResponse' => [] })
     end
     it_behaves_like 'composite requests'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Tim Rogers
@@ -9,15 +9,15 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.9.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
@@ -25,9 +25,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.9.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0