lhc 15.1.1 → 15.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 301499c3239741a748386c3e33d552611f2817f2880579b3df9e320b336db894
-  data.tar.gz: 27c61057ca12aa70076e0fbe71da8cf8f0eac225420dcdd11ba297336aea85e8
+  metadata.gz: 00b791317124325a44a99ca08c5cfabb611affd67d38603476151c106b84d924
+  data.tar.gz: 198d4f707ab907c7209ea1f8bbf41452f46fb3079dbf14a73f243ed37b09d6dc
 SHA512:
-  metadata.gz: 890dd068ed2902de6990b1b90ef5082f4f6d0c26e65022db14157615dd858f7302a8419b8457f6da403f3423aabdfa13f0838a748846f7f93e13339c0415eca6
-  data.tar.gz: e66683421af741d105294a5eb5fb33f26dbab024653b51647f3597e3256cd2bb114202d1599e4f0019f6157b08123afea794c68ddddd6f286518a99476c9dc9d
+  metadata.gz: f6955a082a0e31f564f7b4c6243bfd8274e684cb392702f38d81f044d9ccbc9ff20085428d2529e6a48bd3f194ff69c99686c7744ce681ac8234942f1d4830f5
+  data.tar.gz: 5b11847bfb5f8a9e00797e7c8d87dbd5f9784c6f60cb926d414723fc16faf0fba871ffc6917e63475a6a6a3ae8b49b112b7c6f8fc716a6ee61deaa42d2a040f0

data/.rubocop.yml

@@ -26,6 +26,9 @@ require:
 Bundler/OrderedGems:
   Enabled: false
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Lint/SuppressedException:
   Exclude:
     - spec/**/*
@@ -260,7 +263,7 @@ Style/CaseLikeIf:
   Enabled: false
 
 Style/HashEachMethods:
-  Enabled: false 
+  Enabled: false
 
 Style/HashConversion: # (new in 1.10)
   Enabled: false
@@ -268,6 +271,9 @@ Style/HashConversion: # (new in 1.10)
 Style/NilLambda: # (new in 1.3)
   Enabled: false
 
+Style/OpenStructUse:
+  Enabled: false
+
 RSpec/DescribeClass:
   Exclude:
     - spec/views/**/*

data/lhc.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Advanced HTTP Client for Ruby, fueled with interceptors'
   s.description = 'LHC is an extended/advanced HTTP client. Implementing basic http-communication enhancements like interceptors, exception handling, format handling, accessing response data, configuring endpoints and placeholders and fully compatible, RFC-compliant URL-template support.'
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
+  s.files         = `git ls-files`.split("\n")
   s.require_paths = ['lib']
 
   s.requirements << 'Ruby >= 2.0.0'
@@ -36,6 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop', '~> 1.0'
   s.add_development_dependency 'rubocop-performance', '~> 1.0'
   s.add_development_dependency 'rubocop-rspec', '~> 1.26.0'
+  s.add_development_dependency 'sprockets-rails'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'webmock'
 

data/lib/lhc/interceptors/auth.rb

@@ -39,7 +39,7 @@ class LHC::Auth < LHC::Interceptor
     set_bearer_authorization_header(token)
   end
 
-  # rubocop:disable Style/AccessorMethodName
+  # rubocop:disable Naming/AccessorMethodName
   def set_authorization_header(value)
     request.headers['Authorization'] = value
   end
@@ -50,10 +50,13 @@ class LHC::Auth < LHC::Interceptor
   end
 
   def set_bearer_authorization_header(token)
-    request.options[:auth].merge!(bearer_token: token)
+    auth_options = request.options[:auth] || {}
+    auth_options.merge!(bearer_token: token)
+    request.options[:auth] = auth_options unless request.options.key?(:auth)
+
     set_authorization_header("Bearer #{token}")
   end
-  # rubocop:enable Style/AccessorMethodName
+  # rubocop:enable Naming/AccessorMethodName
 
   def reauthenticate!
     # refresh token and update header

data/lib/lhc/interceptors/rollbar.rb

@@ -7,8 +7,8 @@ class LHC::Rollbar < LHC::Interceptor
   include LHC::FixInvalidEncodingConcern
 
   def after_response
-    return unless Object.const_defined?('Rollbar')
-    return if response.success?
+    return unless Object.const_defined?(:Rollbar)
+    return unless report?
 
     request = response.request
     additional_params = request.options.fetch(:rollbar, {})
@@ -29,9 +29,18 @@ class LHC::Rollbar < LHC::Interceptor
     }.merge additional_params
     begin
       Rollbar.warning("Status: #{response.code} URL: #{request.url}", data)
-    rescue Encoding::UndefinedConversionError
+    rescue JSON::GeneratorError, Encoding::UndefinedConversionError
       sanitized_data = data.deep_transform_values { |value| self.class.fix_invalid_encoding(value) }
       Rollbar.warning("Status: #{response.code} URL: #{request.url}", sanitized_data)
     end
   end
+
+  private
+
+  def report?
+    return false if response.success?
+    return false if response.request.error_ignored?
+
+    true
+  end
 end

data/lib/lhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHC
-  VERSION ||= '15.1.1'
+  VERSION ||= '15.2.0'
 end

data/spec/error/to_s_spec.rb

@@ -15,7 +15,7 @@ describe LHC::Error do
         expect { "#{valid} #{invalid}" }.to raise_error Encoding::CompatibilityError
       end
       it 'to_json on an array raises an error' do
-        expect { [valid, invalid].to_json }.to raise_error Encoding::UndefinedConversionError
+        expect { [valid, invalid].to_json }.to raise_error JSON::GeneratorError
       end
 
       it 'to_s on a hash does not raise an error' do
@@ -23,7 +23,7 @@ describe LHC::Error do
       end
 
       it 'to_json on a hash does raise an error' do
-        expect { { valid: valid, invalid: invalid }.to_json }.to raise_error Encoding::UndefinedConversionError
+        expect { { valid: valid, invalid: invalid }.to_json }.to raise_error JSON::GeneratorError
       end
     end
 

data/spec/interceptors/auth/reauthentication_spec.rb

@@ -27,6 +27,27 @@ describe LHC::Auth do
     expect(auth_suceeding_after_recovery).to have_been_made.once
   end
 
+  context 'without `auth` options' do
+    let(:headers) do
+      { 'Authorization' => "Bearer #{initial_token}" }
+    end
+
+    before do
+      LHC::Auth.refresh_client_token = -> { refresh_token }
+    end
+
+    after do
+      LHC::Auth.refresh_client_token = -> { nil }
+    end
+
+    it 'recovery is attempted' do
+      LHC.config.endpoint(:local, 'http://local.ch')
+      # the retried request (with updated Bearer), that should work
+      LHC.get(:local, { headers: headers })
+      expect(auth_suceeding_after_recovery).to have_been_made.once
+    end
+  end
+
   it "recovery is not attempted again when the request has reauthenticated: true " do
     LHC.config.endpoint(:local, 'http://local.ch', auth: options.merge(reauthenticated: true))
     expect { LHC.get(:local) }.to raise_error(LHC::Unauthorized)

data/spec/interceptors/rollbar/main_spec.rb

@@ -9,7 +9,7 @@ describe LHC::Rollbar do
 
   context 'Rollbar is undefined' do
     before(:each) do
-      Object.send(:remove_const, 'Rollbar') if Object.const_defined?('Rollbar')
+      Object.send(:remove_const, 'Rollbar') if Object.const_defined?(:Rollbar)
     end
     it 'does not report' do
       stub_request(:get, 'http://local.ch').to_return(status: 400)
@@ -65,5 +65,24 @@ describe LHC::Rollbar do
           request: hash_including(url: anything, method: anything, headers: hash_including(private_key: LHC::Scrubber::SCRUB_DISPLAY), params: { api_key: LHC::Scrubber::SCRUB_DISPLAY })
         )
     end
+
+    context 'ignored errors' do
+      it 'does not report to rollbar if the error is ignored' do
+        stub_request(:get, 'http://local.ch').to_return(status: 404)
+        LHC.get('http://local.ch', ignore: [LHC::NotFound])
+        expect(::Rollbar).not_to have_received(:warning)
+      end
+
+      it 'does report to rollbar' do
+        stub_request(:get, 'http://local.ch').to_return(status: 400)
+        expect(-> { LHC.get('http://local.ch', ignore: [LHC::NotFound]) }).to raise_error LHC::BadRequest
+        expect(::Rollbar).not_to have_received(:warning)
+          .with(
+            'Status: 400 URL: http://local.ch',
+            response: hash_including(body: anything, code: anything, headers: anything, time: anything, timeout?: anything),
+            request: hash_including(url: anything, method: anything, headers: hash_including(private_key: LHC::Scrubber::SCRUB_DISPLAY), params: { api_key: LHC::Scrubber::SCRUB_DISPLAY })
+          )
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 15.1.1
+  version: 15.2.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.26.0
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -453,139 +467,4 @@ rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Advanced HTTP Client for Ruby, fueled with interceptors
-test_files:
-- spec/basic_methods/delete_spec.rb
-- spec/basic_methods/get_spec.rb
-- spec/basic_methods/post_spec.rb
-- spec/basic_methods/put_spec.rb
-- spec/basic_methods/request_spec.rb
-- spec/basic_methods/request_without_rails_spec.rb
-- spec/config/endpoints_spec.rb
-- spec/config/placeholders_spec.rb
-- spec/config/scrubs_spec.rb
-- spec/core_ext/hash/deep_transform_values_spec.rb
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/assets/images/.keep
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/mailers/.keep
-- spec/dummy/app/models/.keep
-- spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/lib/assets/.keep
-- spec/dummy/log/.keep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/tmp/cache/.gitkeep
-- spec/endpoint/compile_spec.rb
-- spec/endpoint/match_spec.rb
-- spec/endpoint/placeholders_spec.rb
-- spec/endpoint/remove_interpolated_params_spec.rb
-- spec/endpoint/values_as_params_spec.rb
-- spec/error/dup_spec.rb
-- spec/error/find_spec.rb
-- spec/error/response_spec.rb
-- spec/error/timeout_spec.rb
-- spec/error/to_s_spec.rb
-- spec/formats/form_spec.rb
-- spec/formats/json_spec.rb
-- spec/formats/multipart_spec.rb
-- spec/formats/plain_spec.rb
-- spec/interceptors/after_request_spec.rb
-- spec/interceptors/after_response_spec.rb
-- spec/interceptors/auth/basic_auth_spec.rb
-- spec/interceptors/auth/bearer_spec.rb
-- spec/interceptors/auth/body_spec.rb
-- spec/interceptors/auth/long_basic_auth_credentials_spec.rb
-- spec/interceptors/auth/no_instance_var_for_options_spec.rb
-- spec/interceptors/auth/reauthentication_configuration_spec.rb
-- spec/interceptors/auth/reauthentication_spec.rb
-- spec/interceptors/before_request_spec.rb
-- spec/interceptors/before_response_spec.rb
-- spec/interceptors/caching/hydra_spec.rb
-- spec/interceptors/caching/main_spec.rb
-- spec/interceptors/caching/methods_spec.rb
-- spec/interceptors/caching/multilevel_cache_spec.rb
-- spec/interceptors/caching/options_spec.rb
-- spec/interceptors/caching/parameters_spec.rb
-- spec/interceptors/caching/response_status_spec.rb
-- spec/interceptors/caching/to_cache_spec.rb
-- spec/interceptors/default_interceptors_spec.rb
-- spec/interceptors/default_timeout/main_spec.rb
-- spec/interceptors/define_spec.rb
-- spec/interceptors/dup_spec.rb
-- spec/interceptors/logging/main_spec.rb
-- spec/interceptors/monitoring/caching_spec.rb
-- spec/interceptors/monitoring/main_spec.rb
-- spec/interceptors/prometheus_spec.rb
-- spec/interceptors/response_competition_spec.rb
-- spec/interceptors/retry/main_spec.rb
-- spec/interceptors/return_response_spec.rb
-- spec/interceptors/rollbar/invalid_encoding_spec.rb
-- spec/interceptors/rollbar/main_spec.rb
-- spec/interceptors/throttle/main_spec.rb
-- spec/interceptors/throttle/reset_track_spec.rb
-- spec/interceptors/zipkin/distributed_tracing_spec.rb
-- spec/rails_helper.rb
-- spec/request/body_spec.rb
-- spec/request/encoding_spec.rb
-- spec/request/error_handling_spec.rb
-- spec/request/headers_spec.rb
-- spec/request/ignore_errors_spec.rb
-- spec/request/option_dup_spec.rb
-- spec/request/parallel_requests_spec.rb
-- spec/request/params_encoding_spec.rb
-- spec/request/request_without_rails_spec.rb
-- spec/request/scrubbed_headers_spec.rb
-- spec/request/scrubbed_options_spec.rb
-- spec/request/scrubbed_params_spec.rb
-- spec/request/url_patterns_spec.rb
-- spec/request/user_agent_spec.rb
-- spec/request/user_agent_without_rails_spec.rb
-- spec/response/body_spec.rb
-- spec/response/code_spec.rb
-- spec/response/data_accessor_spec.rb
-- spec/response/data_spec.rb
-- spec/response/effective_url_spec.rb
-- spec/response/headers_spec.rb
-- spec/response/options_spec.rb
-- spec/response/scrubbed_options_spec.rb
-- spec/response/success_spec.rb
-- spec/response/time_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures/json/feedback.json
-- spec/support/fixtures/json/feedbacks.json
-- spec/support/fixtures/json/localina_content_ad.json
-- spec/support/load_json.rb
-- spec/support/reset_config.rb
-- spec/support/zipkin_mock.rb
-- spec/timeouts/no_signal_spec.rb
-- spec/timeouts/timings_spec.rb
+test_files: []