lhc 15.2.1 → 16.0.0.pre.pro2162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42aac9f48f10f07bbe4db078524e5b53ac03e8851184d5206a5898f79d2433ff
-  data.tar.gz: 5446bcfaa0ad5d3d46123326ebd14742b7fad56c32c1658073c3baec94fa41c8
+  metadata.gz: 624333537e8e35fa6ece5b46b1748263e023b439060c8e8b6b7ca0572db52ead
+  data.tar.gz: 588b9c2328f9ef96fa6709d6d12580083712e863838cb6e3b75b9dfb2e0efe35
 SHA512:
-  metadata.gz: 974f22ca22bce0aa13a6c0ee139f8bae16582b2186970259948fb0cf6770191771edc4279c064a93965eca0c54a229ee7bd74da95498dafb9127fd20641c1385
-  data.tar.gz: 806ccd323810f9bd83cd5b5ee087198d17e88d6b5e8cc04859fa42dd7670c5970273f06d7534052ea3e153f5709eaec8cee8349cc5b8dbc7299034b0bf1dd9d8
+  metadata.gz: d038ab78edbddf4f9d3cd8c4f8dd85285448a79498df99f02e9893bf04a68a80fc17fa286555399752452c1e68701307eb2d45112df1bb31df7f96b81c531b23
+  data.tar.gz: d45a0a5e8990644c7748527affe7fcee24f481f10043f6368ca90a5bbe8b76ad6e32fbfecc85e65e8f21765799926576ad815f443b34617540b6da8594f66d2b

data/.rubocop.yml

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

data/README.md

@@ -618,18 +618,12 @@ Adds the following to body of all requests:
 
 ##### Reauthenticate
 
-The current implementation offers only reauthentication for _client access tokens_.
-Make sure that your interceptors contain `LHC::Auth` and `LHC::Retry`, whereas `LHC::Retry` comes _after_ `LHC::Auth` in the chain.
-Provide the refresh token as following:
-```ruby
-LHC.get('http://local.ch', auth: { bearer: -> { access_token }, refresh_client_token: -> { TokenRefreshUtil.client_access_token(true) })
-```
-Where `TokenRefreshUtil.client_access_token(true)` forces a refresh of the token and returns the new token. It is also expected that this implementation will handle invalidating caches if necessary.
+The current implementation can only offer reauthenticate for _client access tokens_. For this to work the following has to be given:
 
-You can also set a global `refresh_client_token`. This is not recommended for apps with multiple endpoint and different access tokens.
-```ruby
-LHC::Auth.refresh_client_token = -> { TokenRefreshUtil.client_access_token(true) }
-```
+* You have configured and implemented `LHC::Auth.refresh_client_token = -> { TokenRefreshUtil.client_access_token(true) }` which when called will force a refresh of the token and return the new value. It is also expected that this implementation will handle invalidating caches if necessary.
+* Your interceptors contain `LHC::Auth` and `LHC::Retry`, whereas `LHC::Retry` comes _after_ `LHC::Auth` in the chain.
+
+##### Bearer Authentication with client access token
 
 Reauthentication will be initiated if:
 

data/lhc.gemspec

@@ -15,7 +15,8 @@ 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.files        = `git ls-files`.split("\n")
+  s.test_files   = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
 
   s.requirements << 'Ruby >= 2.0.0'
@@ -23,7 +24,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport', '>= 5.2'
   s.add_dependency 'addressable'
-  s.add_dependency 'local_uri'
   s.add_dependency 'typhoeus', '>= 0.11'
 
   s.add_development_dependency 'geminabox'
@@ -35,7 +35,6 @@ 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/error.rb

@@ -75,7 +75,7 @@ class LHC::Error < StandardError
     debug << "Options: #{request.scrubbed_options}"
     debug << "Headers: #{request.scrubbed_headers}"
     debug << "Response Code: #{response.code} (#{response.options[:return_code]})"
-    debug << "Response Options: #{response.scrubbed_options}"
+    debug << "Response Options: #{response.options}"
     debug << response.body
     debug << _message
     debug.map { |str| self.class.fix_invalid_encoding(str) }.join("\n")

data/lib/lhc/interceptors/auth.rb

@@ -39,7 +39,7 @@ class LHC::Auth < LHC::Interceptor
     set_bearer_authorization_header(token)
   end
 
-  # rubocop:disable Naming/AccessorMethodName
+  # rubocop:disable Style/AccessorMethodName
   def set_authorization_header(value)
     request.headers['Authorization'] = value
   end
@@ -50,18 +50,20 @@ class LHC::Auth < LHC::Interceptor
   end
 
   def set_bearer_authorization_header(token)
-    auth_options = request.options[:auth] || {}
-    auth_options.merge!(bearer_token: token)
-    request.options[:auth] = auth_options unless request.options.key?(:auth)
-
+    request.options[:auth].merge!(bearer_token: token)
     set_authorization_header("Bearer #{token}")
   end
-  # rubocop:enable Naming/AccessorMethodName
+  # rubocop:enable Style/AccessorMethodName
 
   def reauthenticate!
-    # refresh token and update header
-    token = refresh_client_token_option.call
-    set_bearer_authorization_header(token)
+    # refresh access_token
+    refresh_client_token_option.call
+
+    # Now as the token is refreshe
+    # we need to use the refreshed bearer token
+    # in the authorization header
+    bearer_authentication! if auth_options[:bearer]
+
     # trigger LHC::Retry and ensure we do not trigger reauthenticate!
     # again should it fail another time
     new_options = request.options.dup

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 unless report?
+    return unless Object.const_defined?('Rollbar')
+    return if response.success?
 
     request = response.request
     additional_params = request.options.fetch(:rollbar, {})
@@ -29,18 +29,9 @@ class LHC::Rollbar < LHC::Interceptor
     }.merge additional_params
     begin
       Rollbar.warning("Status: #{response.code} URL: #{request.url}", data)
-    rescue JSON::GeneratorError, Encoding::UndefinedConversionError
+    rescue 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/request.rb

@@ -72,7 +72,6 @@ class LHC::Request
 
   def scrubbed_options
     scrubbed_options = options.deep_dup
-    scrubbed_options[:cache] = LHC::CacheScrubber.new(scrubbed_options[:cache]).scrubbed
     scrubbed_options[:params] = LHC::ParamsScrubber.new(scrubbed_options[:params]).scrubbed
     scrubbed_options[:headers] = LHC::HeadersScrubber.new(scrubbed_options[:headers], scrubbed_options[:auth]).scrubbed
     scrubbed_options[:auth] = LHC::AuthScrubber.new(scrubbed_options[:auth]).scrubbed

data/lib/lhc/response.rb

@@ -54,12 +54,6 @@ class LHC::Response
     request.format
   end
 
-  def scrubbed_options
-    scrubbed_options = options.deep_dup
-    scrubbed_options[:effective_url] = LHC::EffectiveUrlScrubber.new(scrubbed_options[:effective_url]).scrubbed
-    scrubbed_options
-  end
-
   private
 
   attr_accessor :raw

data/lib/lhc/scrubbers/headers_scrubber.rb

@@ -44,7 +44,6 @@ class LHC::HeadersScrubber < LHC::Scrubber
 
   def scrub_bearer_authentication_headers?
     auth_options[:bearer].present? &&
-      auth_options[:bearer_token] &&
       scrubbed['Authorization'].present? &&
       scrubbed['Authorization'].include?(auth_options[:bearer_token])
   end

data/lib/lhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHC
-  VERSION ||= '15.2.1'
+  VERSION ||= '16.0.0-pro2162'
 end

data/lib/lhc.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'local_uri'
 require 'typhoeus'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
@@ -120,10 +119,6 @@ module LHC
            'lhc/scrubbers/auth_scrubber'
   autoload :BodyScrubber,
            'lhc/scrubbers/body_scrubber'
-  autoload :CacheScrubber,
-           'lhc/scrubbers/cache_scrubber'
-  autoload :EffectiveUrlScrubber,
-           'lhc/scrubbers/effective_url_scrubber'
   autoload :HeadersScrubber,
            'lhc/scrubbers/headers_scrubber'
   autoload :ParamsScrubber,

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 JSON::GeneratorError
+        expect { [valid, invalid].to_json }.to raise_error Encoding::UndefinedConversionError
       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 JSON::GeneratorError
+        expect { { valid: valid, invalid: invalid }.to_json }.to raise_error Encoding::UndefinedConversionError
       end
     end
 
@@ -55,12 +55,10 @@ describe LHC::Error do
       end
 
       let(:response) do
-        options = { return_code: :internal_error, response_headers: "" }
         double('LHC::Response',
                request: request,
                code: 500,
-               options: options,
-               scrubbed_options: options,
+               options: { return_code: :internal_error, response_headers: "" },
                body: '{"status":500,"message":"undefined"}')
       end
 

data/spec/interceptors/auth/reauthentication_spec.rb

@@ -5,7 +5,10 @@ require 'rails_helper'
 describe LHC::Auth do
   let(:initial_token) { '123456' }
   let(:refresh_token) { 'abcdef' }
-  let(:options) { { bearer: initial_token, refresh_client_token: -> { refresh_token } } }
+
+  let(:options) do
+    { bearer: -> { DummyAuthentication.access_token }, refresh_client_token: -> { DummyAuthentication.refresh_token } }
+  end
   let!(:auth_failing) do
     stub_request(:get, 'http://local.ch')
       .with(headers: { 'Authorization' => "Bearer #{initial_token}" })
@@ -17,6 +20,23 @@ describe LHC::Auth do
   end
 
   before(:each) do
+    class DummyAuthentication
+
+      def self.refresh_token
+        # updates access_token
+      end
+
+      def self.access_token
+        # this is used as bearer token
+      end
+    end
+
+    # It does not matter what value this method returns it is not use by LHC.
+    # That method needs just to make sure that the value of the access_token
+    # is the new valid token
+    allow(DummyAuthentication).to receive(:refresh_token).and_return(nil)
+
+    allow(DummyAuthentication).to receive(:access_token).and_return(initial_token, refresh_token)
     LHC.config.interceptors = [LHC::Auth, LHC::Retry]
   end
 
@@ -27,27 +47,6 @@ 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,24 +65,5 @@ 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

data/spec/request/scrubbed_headers_spec.rb

@@ -74,14 +74,6 @@ describe LHC::Request do
         LHC.config.scrubs = {}
         expect(request.scrubbed_headers).to include(authorization_header)
       end
-
-      context 'when the bearer_token is nil' do
-        let(:bearer_token) { nil }
-
-        it 'scrubs nothing' do
-          expect(request.scrubbed_headers).to include(authorization_header)
-        end
-      end
     end
 
     context 'basic authentication' do

data/spec/request/scrubbed_options_spec.rb

@@ -18,12 +18,9 @@ describe LHC::Request do
   let(:params) { { api_key: 'api-key-params' } }
   let(:headers) { { private_key: 'private-key-header' } }
   let(:body) { { user_token: 'user-token-body' } }
-  let(:cache) do
-    { key: "LHS_REQUEST_CYCLE_CACHE(v1) POST http://local.ch?#{params}" }
-  end
 
   let(:request) do
-    response = LHC.post(:local, params: params, headers: headers, body: body, cache: cache)
+    response = LHC.post(:local, params: params, headers: headers, body: body)
     response.request
   end
 
@@ -33,8 +30,6 @@ describe LHC::Request do
     expect(request.scrubbed_options[:body]).to include(user_token: LHC::Scrubber::SCRUB_DISPLAY)
     expect(request.scrubbed_options[:auth][:bearer_token]).to eq(LHC::Scrubber::SCRUB_DISPLAY)
     expect(request.scrubbed_options[:auth][:basic]).to be nil
-    expect(request.scrubbed_options[:cache])
-      .to include(key: "LHS_REQUEST_CYCLE_CACHE(v1) POST http://local.ch?{:api_key=>\"[FILTERED]\"}")
   end
 
   context 'when bearer auth is not a proc' do
@@ -58,19 +53,6 @@ describe LHC::Request do
     end
   end
 
-  context 'when parameter should not get scrubbed' do
-    let(:params) { { any_parameter: 'any-parameter' } }
-
-    let(:cache) do
-      { key: "LHS_REQUEST_CYCLE_CACHE(v1) POST http://local.ch?#{params}" }
-    end
-
-    it 'does not scrubb the parameter' do
-      expect(request.scrubbed_options[:cache])
-        .to include(key: "LHS_REQUEST_CYCLE_CACHE(v1) POST http://local.ch?#{params}")
-    end
-  end
-
   context 'when body data is nested' do
     let(:body) do
       {
@@ -122,8 +104,6 @@ describe LHC::Request do
       expect(request.scrubbed_options[:headers]).not_to include(private_key: LHC::Scrubber::SCRUB_DISPLAY)
       expect(request.scrubbed_options[:body]).not_to include(user_token: LHC::Scrubber::SCRUB_DISPLAY)
       expect(request.scrubbed_options[:auth][:bearer_token]).not_to eq(LHC::Scrubber::SCRUB_DISPLAY)
-      expect(request.scrubbed_options[:cache])
-        .not_to include(key: "LHS_REQUEST_CYCLE_CACHE(v1) POST http://local.ch?{:api_key=>\"[FILTERED]\"}")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 15.2.1
+  version: 16.0.0.pre.pro2162
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: local_uri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +178,6 @@ 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
@@ -301,8 +273,6 @@ files:
 - lib/lhc/scrubber.rb
 - lib/lhc/scrubbers/auth_scrubber.rb
 - lib/lhc/scrubbers/body_scrubber.rb
-- lib/lhc/scrubbers/cache_scrubber.rb
-- lib/lhc/scrubbers/effective_url_scrubber.rb
 - lib/lhc/scrubbers/headers_scrubber.rb
 - lib/lhc/scrubbers/params_scrubber.rb
 - lib/lhc/test/cache_helper.rb
@@ -431,7 +401,6 @@ files:
 - 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
@@ -458,13 +427,147 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - Ruby >= 2.0.0
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Advanced HTTP Client for Ruby, fueled with interceptors
-test_files: []
+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/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

data/lib/lhc/scrubbers/cache_scrubber.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class LHC::CacheScrubber < LHC::Scrubber
-  def initialize(data)
-    super(data)
-    scrub_cache_options!
-  end
-
-  private
-
-  def scrub_cache_options!
-    return if scrubbed.blank?
-    return if scrub_elements.blank?
-
-    scrub_cache_key!
-  end
-
-  def scrub_cache_key!
-    return if scrubbed[:key].blank?
-
-    scrub_elements.each do |scrub_element|
-      matches = scrubbed[:key].match(/:#{scrub_element}=>"(.*?)"/)
-      next if matches.nil?
-
-      value = matches[-1]
-      scrubbed[:key].gsub!(value, SCRUB_DISPLAY)
-    end
-  end
-
-  def scrub_elements
-    # The cache key includes the whole request url inklusive params.
-    # We need to scrub those params from the cache key.
-    LHC.config.scrubs[:params]
-  end
-end

data/lib/lhc/scrubbers/effective_url_scrubber.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class LHC::EffectiveUrlScrubber < LHC::Scrubber
-  def initialize(data)
-    super(data)
-    scrub_effective_url_options!
-  end
-
-  private
-
-  def scrub_effective_url_options!
-    return if scrubbed.blank?
-    return if scrub_elements.blank?
-
-    scrub_effective_url!
-  end
-
-  def scrub_effective_url!
-    return if scrubbed.blank?
-
-    scrub_elements.each do |scrub_element|
-      uri = LocalUri::URI.new(scrubbed)
-      self.scrubbed = CGI.unescape(uri.query.merge(scrub_element => SCRUB_DISPLAY).to_s)
-    end
-  end
-
-  def scrub_elements
-    # The effective url includes the params of the request
-    # so we need to scrub those params from the effective url.
-    LHC.config.scrubs[:params]
-  end
-end

data/spec/response/scrubbed_options_spec.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe LHC::Response do
-  let(:options) do
-    { effective_url: 'http://local.ch?api_key=api-key' }
-  end
-
-  let(:raw_response) { OpenStruct.new(options: options) }
-
-  before do
-    LHC.config.scrubs[:params] << 'api_key'
-  end
-
-  it 'scrubbes effective url' do
-    response = LHC::Response.new(raw_response, nil)
-    expect(response.scrubbed_options[:effective_url]).to eq "http://local.ch?api_key=#{LHC::Scrubber::SCRUB_DISPLAY}"
-  end
-end