restforce 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1eb25f3f88951d1770c5850c41a9d673d3b0406a76d0c35e54288d52ee5dc00
-  data.tar.gz: 51af3a7a4a1e701a4f5e8a79c21452ca5417581aa889188e7f5b5e010fb8f39a
+  metadata.gz: c4f7647ad705f0f4eac359a3b1e792ab4603e9ae4d177570e9369734f7ff3356
+  data.tar.gz: 7fc076cb9239ebd513926e068d5d1e4ebec01cbb5245e919fd165ea5bf7b841c
 SHA512:
-  metadata.gz: eabc94739d7bbdb2e88fcf3b2ff4bfb3c0b4272f74f50d6fef3f549ca559cd52ab212b5fbd6988da0237257aef7d092b4f654e275a797beb28947b268263f07d
-  data.tar.gz: 56ac8e739182f941a45cffe4c8b28364d8b99243128c8c7864820e15e752785af3938c8f99377e3428dcc9a61ac98a72703850675455cc88effe5b68bdca454b
+  metadata.gz: ad1cfc119e9d3a64d5491c667254647a1e79298bebb7c036dee95f87b2a6823f0ed5fbb862dc29c6d25166399042767ecae5520498726fa4025b99b439bcd9f1
+  data.tar.gz: f8e0ab3e2cc1e74e4a1d8d50da2ca8b5bcb13436765993c8737582703248c1c47ca2c6ff02430f19390c02f1b5d95960e6d40e5510ef53e5b25d4e61add35ecc

data/.rubocop_todo.yml

@@ -12,7 +12,7 @@
 # SupportedHashRocketStyles: key, separator, table
 # SupportedColonStyles: key, separator, table
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
+Layout/HashAlignment:
   Exclude:
     - 'lib/restforce/middleware/logger.rb'
     - 'restforce.gemspec'
@@ -23,7 +23,7 @@ Layout/AlignHash:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Exclude:
     - 'lib/restforce/concerns/connection.rb'
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.2.1 (Dec 4, 2019)
+
+* Handle empty response bodies returned with authentication errors (@sylvandor)
+* Fix Faraday deprecation warning in newer Faraday versions (`v0.17.1` onwards) caused by inheriting from a deprecated class 
+
 ## 4.2.0 (Oct 23, 2019)
 
 * Add support for platform events, CDC, generic events, etc. in the Streaming API (@nathanKramer)

data/lib/restforce.rb

@@ -48,15 +48,15 @@ module Restforce
   APIVersionError     = Class.new(Error)
   BatchAPIError       = Class.new(Error)
 
-  # Inherit from Faraday::Error::ResourceNotFound for backwards-compatibility
-  # Consumers of this library that rescue and handle Faraday::Error::ResourceNotFound
+  # Inherit from Faraday::ResourceNotFound for backwards-compatibility
+  # Consumers of this library that rescue and handle Faraday::ResourceNotFound
   # can continue to do so.
-  NotFoundError       = Class.new(Faraday::Error::ResourceNotFound)
+  NotFoundError       = Class.new(Faraday::ResourceNotFound)
 
-  # Inherit from Faraday::Error::ClientError for backwards-compatibility
-  # Consumers of this library that rescue and handle Faraday::Error::ClientError
+  # Inherit from Faraday::ClientError for backwards-compatibility
+  # Consumers of this library that rescue and handle Faraday::ClientError
   # can continue to do so.
-  ResponseError       = Class.new(Faraday::Error::ClientError)
+  ResponseError       = Class.new(Faraday::ClientError)
   MatchesMultipleError= Class.new(ResponseError)
   EntityTooLargeError = Class.new(ResponseError)
 

data/lib/restforce/concerns/api.rb

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

data/lib/restforce/concerns/connection.rb

@@ -72,9 +72,9 @@ module Restforce
       # Internal: Faraday Connection options
       def connection_options
         { request: {
-            timeout: options[:timeout],
-            open_timeout: options[:timeout]
-},
+          timeout: options[:timeout],
+          open_timeout: options[:timeout]
+        },
           proxy: options[:proxy_uri],
           ssl: options[:ssl] }
       end

data/lib/restforce/middleware/authentication.rb

@@ -63,7 +63,10 @@ module Restforce
 
     # Internal: The parsed error response.
     def error_message(response)
-      "#{response.body['error']}: #{response.body['error_description']}"
+      return response.status.to_s unless response.body
+
+      "#{response.body['error']}: #{response.body['error_description']} " \
+        "(#{response.status})"
     end
 
     # Featured detect form encoding.

data/lib/restforce/middleware/instance_url.rb

@@ -14,7 +14,7 @@ module Restforce
     end
 
     def url_prefix_set?
-      !!(connection.url_prefix&.host)
+      !!connection.url_prefix&.host
     end
   end
 end

data/lib/restforce/version.rb

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

data/restforce.gemspec

@@ -30,12 +30,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json', '>= 1.7.5'
   gem.add_dependency 'jwt', ['>= 1.5.6']
 
-  gem.add_dependency 'hashie', ['>= 1.2.0', '< 4.0']
+  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', '~> 0.75.0'
+  gem.add_development_dependency 'rubocop', '~> 0.77.0'
   gem.add_development_dependency 'simplecov', '~> 0.17.1'
   gem.add_development_dependency 'webmock', '~> 3.7.6'
 end

data/spec/integration/abstract_client_spec.rb

@@ -125,7 +125,7 @@ shared_examples_for Restforce::AbstractClient do
 
       it {
         should raise_error(
-          Faraday::Error::ResourceNotFound,
+          Faraday::ResourceNotFound,
           "#{error.first['errorCode']}: #{error.first['message']}"
         )
       }
@@ -239,7 +239,7 @@ shared_examples_for Restforce::AbstractClient do
                status: 404
 
       subject { lambda { destroy! } }
-      it { should raise_error Faraday::Error::ResourceNotFound }
+      it { should raise_error Faraday::ResourceNotFound }
     end
 
     context 'with success' do

data/spec/unit/concerns/api_spec.rb

@@ -274,7 +274,7 @@ describe Restforce::Concerns::API do
       end
 
       it 'rescues exceptions' do
-        [Faraday::Error::ClientError].each do |exception_klass|
+        [Faraday::ClientError].each do |exception_klass|
           client.should_receive(:"#{method}!").
             with(*args).
             and_raise(exception_klass.new(nil))

data/spec/unit/middleware/authentication_spec.rb

@@ -89,4 +89,25 @@ describe Restforce::Middleware::Authentication do
       connection.ssl[:version].should eq(:TLSv1_2)
     end
   end
+
+  describe '.error_message' do
+    context 'when response.body is present' do
+      let(:response) {
+        Faraday::Response.new(
+          body: { 'error' => 'error', 'error_description' => 'description' },
+          status: 401
+        )
+      }
+
+      subject { middleware.error_message(response) }
+      it { should eq "error: description (401)" }
+    end
+
+    context 'when response.body is nil' do
+      let(:response) { Faraday::Response.new(status: 401) }
+
+      subject { middleware.error_message(response) }
+      it { should eq "401" }
+    end
+  end
 end

data/spec/unit/middleware/raise_error_spec.rb

@@ -18,8 +18,8 @@ describe Restforce::Middleware::RaiseError do
                                               'INVALID_FIELD: error_message'
       end
 
-      it 'raises an error that inherits from Faraday::Error::ResourceNotFound' do
-        expect { on_complete }.to raise_error Faraday::Error::ResourceNotFound
+      it 'raises an error that inherits from Faraday::ResourceNotFound' do
+        expect { on_complete }.to raise_error Faraday::ResourceNotFound
       end
     end
 
@@ -31,8 +31,8 @@ describe Restforce::Middleware::RaiseError do
                                               /300: The external ID provided/
       end
 
-      it 'raises an error that inherits from Faraday::Error::ClientError' do
-        expect { on_complete }.to raise_error Faraday::Error::ClientError
+      it 'raises an error that inherits from Faraday::ClientError' do
+        expect { on_complete }.to raise_error Faraday::ClientError
       end
     end
 
@@ -44,8 +44,8 @@ describe Restforce::Middleware::RaiseError do
                                               'INVALID_FIELD: error_message'
       end
 
-      it 'raises an error that inherits from Faraday::Error::ClientError' do
-        expect { on_complete }.to raise_error Faraday::Error::ClientError
+      it 'raises an error that inherits from Faraday::ClientError' do
+        expect { on_complete }.to raise_error Faraday::ClientError
       end
     end
 
@@ -66,8 +66,8 @@ describe Restforce::Middleware::RaiseError do
                                               '413: Request Entity Too Large'
       end
 
-      it 'raises an error that inherits from Faraday::Error::ClientError' do
-        expect { on_complete }.to raise_error Faraday::Error::ClientError
+      it 'raises an error that inherits from Faraday::ClientError' do
+        expect { on_complete }.to raise_error Faraday::ClientError
       end
     end
 
@@ -80,8 +80,8 @@ describe Restforce::Middleware::RaiseError do
                                               "(error code missing): #{body}"
       end
 
-      it 'raises an error that inherits from Faraday::Error::ClientError' do
-        expect { on_complete }.to raise_error Faraday::Error::ClientError,
+      it 'raises an error that inherits from Faraday::ClientError' do
+        expect { on_complete }.to raise_error Faraday::ClientError,
                                               "(error code missing): #{body}"
       end
     end

data/spec/unit/sobject_spec.rb

@@ -45,13 +45,10 @@ describe Restforce::SObject do
     destroy: :destroy,
     destroy!: :destroy! }.each do |method, receiver|
     describe ".#{method}" do
-      subject(:send_method) { sobject.send(method) }
+      subject(:send_method) { lambda { sobject.send(method) } }
 
       context 'when an Id was not queried' do
-        it "raises an error" do
-          expect { send_method }.to raise_error ArgumentError,
-                                                /need to query the Id for the record/
-        end
+        it { should raise_error ArgumentError, /need to query the Id for the record/ }
       end
 
       context 'when an Id is present' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Eric J. Holmes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -88,7 +88,7 @@ dependencies:
         version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
         version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement
@@ -147,14 +147,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 0.77.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 0.77.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement