lhc 9.2.0 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e82411889a538078642c154032b132cec72cf53b
-  data.tar.gz: 12f685a1fb5cb8e9452ecd3c2f8ffaf2621a7122
+  metadata.gz: 4c7d1ebc28ca92627c9828b98adffdf9e57cd41e
+  data.tar.gz: f69dcd78f74648df6cf81189743fce7e9b78e2ee
 SHA512:
-  metadata.gz: efa93d6795be75faa9151a9b4fb273338e6fe7ff4d9772302b3f6a04b08364c3111b71e7b0d3529d2af8a8f965d9e23c5d71df5141a83677dfa21bafd2a26738
-  data.tar.gz: 8d88b401cfe5122a19cb6ac5c2f5b2478a0bf231858e7430edd133f4f6c592e165f9ca2c6bf1cbf8e433a93027f7892bbcc890bd638c1cec4d8419b158331b8e
+  metadata.gz: beb8f74e3901b68de00d2d2c3ebc9874666aee0dac0eaef6d49a16482f1d82a45cf6f47e9aad98ae0ffc60cc5784a7c04d7865acc95a90e68a3e681d31fe52fd
+  data.tar.gz: 1df77507930a88568ef63e9fab8f62ee9a09440b7d8d1b2502f703652d22d7cfe15b423612bc7a11233cd6731bb0c18c64d87809a4bc59e7452e94afae1ad8bb

data/.rubocop.localch.yml

@@ -1,22 +1,21 @@
 # This is master rubocop configuration.
 # DO NOT EDIT THIS FILE - it WILL be overwriten on every config update
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
   DisplayCopNames: true
   DisplayStyleGuide: true
-  Include:
-    - '**/Rakefile'
-    - '**/config.ru'
-    - '**/Capfile'
   Exclude:
     - 'db/**/*'
     - 'script/**/*'
     - 'vendor/bundle/**/*'
+    - 'vendor/assets/**/*'
     - 'bin/**/*'
     - 'config/unicorn.rb'
     - 'config/compass.rb'
     - 'Rakefile'
-    - 'spec/error/to_s_spec.rb' # this file contains invalid UTF8 character on purpose!
+    - 'app/controllers/error_trap_controller.rb'
+    - 'app/controllers/hsts_controller.rb'
+    - 'spec/lib/util_spec.rb'
 
 Rails:
   Enabled: true
@@ -24,10 +23,19 @@ Rails:
 require:
   - rubocop-rspec
 
+Bundler/OrderedGems:
+  Enabled: false
+
 Lint/HandleExceptions:
   Exclude:
     - spec/**/*
 
+Lint/UriEscapeUnescape:
+  Enabled: false
+
+Style/RescueStandardError:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
 
@@ -49,6 +57,9 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ParameterLists:
   Enabled: false
 
@@ -73,9 +84,39 @@ Performance/RedundantMerge:
 Performance/Casecmp:
   Enabled: false
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Layout/DotPosition:
+  EnforcedStyle: leading
+
+Layout/AlignParameters:
+  Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
+Layout/MultilineMethodCallBraceLayout:
+  EnforcedStyle: symmetrical
+
+Layout/EmptyLinesAroundBlockBody:
+  EnforcedStyle: no_empty_lines
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Layout/MultilineArrayBraceLayout:
+  EnforcedStyle: symmetrical
+
+Layout/MultilineHashBraceLayout:
+  EnforcedStyle: symmetrical
+
 Style/StringLiterals:
   Enabled: false
 
@@ -83,21 +124,12 @@ Style/RegexpLiteral:
   Exclude:
     - spec/**/*
 
-Style/DotPosition:
-  EnforcedStyle: leading
-
-Style/AlignParameters:
-  Enabled: false
-
 Style/NumericLiterals:
   Enabled: false
 
 Style/WordArray:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
 Style/Next:
   Enabled: false
 
@@ -156,7 +188,7 @@ Style/Documentation:
 Style/GuardClause:
   Enabled: false
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - spec/support/pages/**/*
 
@@ -169,11 +201,50 @@ Style/MutableConstant:
 Style/ConditionalAssignment:
   Enabled: false
 
-Style/IndentArray:
-  EnforcedStyle: consistent
+Style/Lambda:
+  Enabled: false
 
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/HashSyntax:
+  EnforcedStyle: ruby19
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+Style/TernaryParentheses:
+  EnforcedStyle: require_parentheses_when_complex
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/RegexpLiteral:
+  AllowInnerSlashes: false
+
+Style/BlockComments:
+  Enabled: false
+
+Style/RedundantParentheses:
+  Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - Gemfile
+    - Brewfile
+    - Guardfile
+
+Style/NumericPredicate:
+  Enabled: false
 
 RSpec/DescribeClass:
   Exclude:
@@ -185,7 +256,70 @@ RSpec/DescribeClass:
 RSpec/FilePath:
   Enabled: false
 
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/HookArgument:
+  EnforcedStyle: implicit
+
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+RSpec/NestedGroups:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/LeadingSubject:
+  Enabled: false
+
+RSpec/ExpectInHook:
+  Enabled: false
+
+RSpec/ReturnFromStub:
+  Enabled: false
+
+RSpec/SubjectStub:
+  Enabled: false
+
+RSpec/EmptyLineAfterSubject:
+  Enabled: false
+
+RSpec/LetSetup:
+  Enabled: false
+
+RSpec/ImplicitExpect:
+  EnforcedStyle: is_expected
+
+RSpec/ScatteredLet:
+  Enabled: false
+
+RSpec/ContextWording:
+  Enabled: false
+
 Rails/Output:
   Exclude:
     - 'config/application.rb'
     - 'config/initializers/asset_manifest_warning.rb'
+
+Rails/DynamicFindBy:
+  Enabled: false
+
+Rails/Presence:
+  Enabled: false
+
+Capybara/CurrentPathExpectation:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false

data/.rubocop.yml

@@ -44,3 +44,15 @@ RSpec/InstanceVariable:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/BeforeAfterAll:
+  Enabled: false
+
+Style/EmptyMethod:
+  EnforcedStyle: compact

data/docs/interceptors/authentication.md

@@ -31,3 +31,24 @@ Adds the following header to the request:
 ```
 
 Which is the base64 encoded credentials "username:password".
+
+# Reauthenticate
+
+The current implementation can only offer reauthenticate for _client access tokens_. For this to work the following has to be given:
+
+* 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:
+
+* setup is correct
+* `response.success?` is false and an `LHC::Unauthorized` was observed
+* reauthentication wasn't already attempted once
+
+If this is the case, this happens:
+
+* refresh the client token, by calling `refresh_client_token`
+* the authentication header will be updated with the new token
+* `LHC::Retry` will be triggered by adding `retry: { max: 1 }` to the request options

data/lhc.gemspec

@@ -1,4 +1,4 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "lhc/version"
@@ -18,20 +18,20 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.requirements << 'Ruby >= 2.0.0'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'typhoeus', '>= 0.11'
   s.add_dependency 'activesupport', '>= 4.2'
   s.add_dependency 'addressable'
+  s.add_dependency 'typhoeus', '>= 0.11'
 
-  s.add_development_dependency 'rspec-rails', '>= 3.0.0'
-  s.add_development_dependency 'rails', '~> 4.2'
-  s.add_development_dependency 'webmock'
   s.add_development_dependency 'geminabox'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'rubocop', '~> 0.36.0'
-  s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'prometheus-client', '~> 0.7.1'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rails', '~> 4.2'
+  s.add_development_dependency 'rspec-rails', '>= 3.0.0'
+  s.add_development_dependency 'rubocop', '~> 0.57.1'
+  s.add_development_dependency 'rubocop-rspec', '~> 1.26.0'
+  s.add_development_dependency 'webmock'
 
   s.license = 'GPL-3'
 end

data/lib/lhc/concerns/lhc/basic_methods_concern.rb

@@ -18,7 +18,7 @@ module LHC
           request(options.merge(
                     url: url,
                     method: http_method
-          ))
+                  ))
         end
       end
 

data/lib/lhc/config.rb

@@ -10,7 +10,7 @@ class LHC::Config
 
   def endpoint(name, url, options = {})
     name = name.to_sym
-    fail 'Endpoint already exists for that name' if @endpoints[name]
+    raise 'Endpoint already exists for that name' if @endpoints[name]
     @endpoints[name] = LHC::Endpoint.new(url, options)
   end
 
@@ -20,7 +20,7 @@ class LHC::Config
 
   def placeholder(name, value)
     name = name.to_sym
-    fail 'Placeholder already exists for that name' if @placeholders[name]
+    raise 'Placeholder already exists for that name' if @placeholders[name]
     @placeholders[name] = value
   end
 
@@ -33,7 +33,7 @@ class LHC::Config
   end
 
   def interceptors=(interceptors)
-    fail 'Default interceptors already set and can only be set once' if @interceptors
+    raise 'Default interceptors already set and can only be set once' if @interceptors
     @interceptors = interceptors
   end
 

data/lib/lhc/endpoint.rb

@@ -3,7 +3,8 @@ require 'addressable/template'
 # An endpoint is an url that leads to a backend resource.
 # The url can also be an url-template (https://tools.ietf.org/html/rfc6570).
 class LHC::Endpoint
-  attr_accessor :url, :options
+  attr_accessor :url
+  attr_writer :options
 
   def initialize(url, options = nil)
     self.url = url
@@ -22,7 +23,7 @@ class LHC::Endpoint
     if expanded.variables.empty?
       expanded.pattern
     else
-      fail("Compilation incomplete. Unable to find value for #{expanded.variables.join(', ')}.")
+      raise("Compilation incomplete. Unable to find value for #{expanded.variables.join(', ')}.")
     end
   end
 
@@ -99,7 +100,7 @@ class LHC::Endpoint
   # Extracts the values from url and
   # creates params according to template
   def self.values_as_params(template, url)
-    fail("#{url} does not match the template: #{template}") if !match?(url, template)
+    raise("#{url} does not match the template: #{template}") if !match?(url, template)
     new(template).values_as_params(url)
   end
 

data/lib/lhc/interceptors.rb

@@ -16,7 +16,7 @@ class LHC::Interceptors
     all.each do |interceptor|
       result = interceptor.send(name)
       if result.is_a? LHC::Response
-        fail 'Response already set from another interceptor' if @response
+        raise 'Response already set from another interceptor' if @response
         @response = interceptor.request.response = result
       end
     end

data/lib/lhc/interceptors/auth.rb

@@ -1,33 +1,96 @@
 class LHC::Auth < LHC::Interceptor
+  include ActiveSupport::Configurable
+  config_accessor :refresh_client_token
 
   def before_request
-    options = request.options[:auth] || {}
-    authenticate!(request, options)
+    authenticate!
+  end
+
+  def after_response
+    return unless configuration_correct?
+    return unless reauthenticate?
+    reauthenticate!
   end
 
   private
 
-  def authenticate!(request, options)
-    if options[:bearer]
-      bearer_authentication!(request, options)
-    elsif options[:basic]
-      basic_authentication!(request, options)
+  def authenticate!
+    if auth_options[:bearer]
+      bearer_authentication!
+    elsif auth_options[:basic]
+      basic_authentication!
     end
   end
 
-  def basic_authentication!(request, options)
-    auth = options[:basic]
+  def basic_authentication!
+    auth = auth_options[:basic]
     credentials = "#{auth[:username]}:#{auth[:password]}"
-    set_authorization_header request, "Basic #{Base64.encode64(credentials).chomp}"
+    set_authorization_header("Basic #{Base64.encode64(credentials).chomp}")
   end
 
-  def bearer_authentication!(request, options)
-    token = options[:bearer]
+  def bearer_authentication!
+    token = auth_options[:bearer]
     token = token.call if token.is_a?(Proc)
-    set_authorization_header request, "Bearer #{token}"
+    set_bearer_authorization_header(token)
   end
 
-  def set_authorization_header(request, value)
+  # rubocop:disable Style/AccessorMethodName
+  def set_authorization_header(value)
     request.headers['Authorization'] = value
   end
+
+  def set_bearer_authorization_header(token)
+    set_authorization_header("Bearer #{token}")
+  end
+  # rubocop:enable Style/AccessorMethodName
+
+  def reauthenticate!
+    # refresh token and update header
+    token = refresh_client_token_option.call
+    set_bearer_authorization_header(token)
+    # trigger LHC::Retry and ensure we do not trigger reauthenticate!
+    # again should it fail another time
+    new_options = request.options.dup
+    new_options = new_options.merge(retry: { max: 1 })
+    new_options = new_options.merge(auth: { reauthenticated: true })
+    request.options = new_options
+  end
+
+  def reauthenticate?
+    !response.success? &&
+      !auth_options[:reauthenticated] &&
+      bearer_header_present? &&
+      LHC::Error.find(response) == LHC::Unauthorized
+  end
+
+  def bearer_header_present?
+    @has_bearer_header ||= request.headers['Authorization'] =~ /^Bearer [0-9a-f-]+$/i
+  end
+
+  def refresh_client_token_option
+    @refresh_client_token_option ||= auth_options[:refresh_client_token] || refresh_client_token
+  end
+
+  def all_interceptor_classes
+    @all_interceptors ||= LHC::Interceptors.new(request).all.map(&:class)
+  end
+
+  def auth_options
+    @auth_options ||= request.options[:auth].dup || {}
+  end
+
+  def configuration_correct?
+    # warn user about configs, only if refresh_client_token_option is set at all
+    refresh_client_token_option && refresh_client_token? && retry_interceptor?
+  end
+
+  def refresh_client_token?
+    return true if refresh_client_token_option.is_a?(Proc)
+    warn("[WARNING] The given refresh_client_token must be a Proc for reauthentication.")
+  end
+
+  def retry_interceptor?
+    return true if all_interceptor_classes.include?(LHC::Retry) && all_interceptor_classes.index(LHC::Retry) > all_interceptor_classes.index(self.class)
+    warn("[WARNING] Your interceptors must include LHC::Retry after LHC::Auth.")
+  end
 end

data/lib/lhc/interceptors/caching.rb

@@ -15,7 +15,7 @@ class LHC::Caching < LHC::Interceptor
     key = key(request, options[:key])
     response_data = cache_for(options).fetch(key)
     return unless response_data
-    logger.info "Served from cache: #{key}" if logger
+    logger&.info "Served from cache: #{key}"
     from_cache(request, response_data)
   end
 
@@ -51,7 +51,7 @@ class LHC::Caching < LHC::Interceptor
   # returns the request_options
   # will map deprecated options to the new format
   def options(request_options)
-    options = request_options[:cache] == true ? {} : request_options[:cache].dup
+    options = (request_options[:cache] == true) ? {} : request_options[:cache].dup
     map_deprecated_options!(request_options, options)
     options
   end

data/lib/lhc/interceptors/logging.rb

@@ -6,14 +6,14 @@ class LHC::Logging < LHC::Interceptor
   def before_request
     return unless logger
     logger.info(
-      "Before LHC request<#{request.object_id}> #{request.method.upcase} #{request.url} at #{DateTime.now} Params=#{request.params} Headers=#{request.headers}"
+      "Before LHC request<#{request.object_id}> #{request.method.upcase} #{request.url} at #{Time.now.iso8601} Params=#{request.params} Headers=#{request.headers}"
     )
   end
 
   def after_response
     return unless logger
     logger.info(
-      "After LHC response for request<#{request.object_id}> #{request.method.upcase} #{request.url} at #{DateTime.now} Time=#{response.time_ms}ms URL=#{response.effective_url}"
+      "After LHC response for request<#{request.object_id}> #{request.method.upcase} #{request.url} at #{Time.now.iso8601} Time=#{response.time_ms}ms URL=#{response.effective_url}"
     )
   end
 end

data/lib/lhc/request.rb

@@ -143,6 +143,6 @@ class LHC::Request
   end
 
   def throw_error(response)
-    fail error.new(error, response)
+    raise error.new(error, response)
   end
 end

data/lib/lhc/response/data.rb

@@ -16,7 +16,7 @@ class LHC::Response::Data
     end
   end
 
-  def method_missing(method, *args, &block)
+  def method_missing(method, *args, &block) # rubocop:disable Style/MethodMissingSuper
     @base.send(method, *args, &block)
   end
 

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= '9.2.0'
+  VERSION ||= '9.3.0'
 end

data/spec/basic_methods/delete_spec.rb

@@ -19,14 +19,14 @@ describe LHC do
       LHC.delete('http://datastore/v2/feedbacks/12121')
     end
 
-    it 'it makes response data available in a rails way' do
+    it 'makes response data available in a rails way' do
       response = LHC.delete('http://datastore/v2/feedbacks/12121')
       expect(response.data.recommended).to eq true
     end
 
     it 'provides response headers' do
       response = LHC.delete('http://datastore/v2/feedbacks/12121')
-      expect(response.headers).to be
+      expect(response.headers).to be_present
     end
   end
 end

data/spec/basic_methods/get_spec.rb

@@ -22,14 +22,14 @@ describe LHC do
       LHC.get(:feedbacks, params: parameters)
     end
 
-    it 'it makes response data available in a rails way' do
+    it 'makes response data available in a rails way' do
       response = LHC.get('http://datastore/v2/feedbacks', params: parameters)
       expect(response.data.total).to eq 99
     end
 
     it 'provides response headers' do
       response = LHC.get('http://datastore/v2/feedbacks', params: parameters)
-      expect(response.headers).to be
+      expect(response.headers).to be_present
     end
   end
 

data/spec/basic_methods/post_spec.rb

@@ -27,14 +27,14 @@ describe LHC do
       LHC.post(:feedbacks, body: feedback)
     end
 
-    it 'it makes response data available in a rails way' do
+    it 'makes response data available in a rails way' do
       response = LHC.post('http://datastore/v2/feedbacks', body: feedback)
       expect(response.data.source_id).to eq 'aaa'
     end
 
     it 'provides response headers' do
       response = LHC.post('http://datastore/v2/feedbacks', body: feedback)
-      expect(response.headers).to be
+      expect(response.headers).to be_present
     end
   end
 end

data/spec/basic_methods/put_spec.rb

@@ -33,14 +33,14 @@ describe LHC do
       LHC.put(:feedbacks, body: change)
     end
 
-    it 'it makes response data available in a rails way' do
+    it 'makes response data available in a rails way' do
       response = LHC.put('http://datastore/v2/feedbacks', body: change)
       expect(response.data.recommended).to eq false
     end
 
     it 'provides response headers' do
       response = LHC.put('http://datastore/v2/feedbacks', body: change)
-      expect(response.headers).to be
+      expect(response.headers).to be_present
     end
   end
 end

data/spec/endpoint/match_spec.rb

@@ -16,7 +16,7 @@ describe LHC::Endpoint do
         'http://local.ch/places/1/feedbacks.json' => 'http://local.ch/places/1/feedbacks.json?lang=en'
       }.each do |template, url|
         it "#{url} matches #{template}" do
-          expect(LHC::Endpoint.match?(url, template)).to be
+          expect(LHC::Endpoint.match?(url, template)).to be(true)
         end
       end
     end
@@ -31,7 +31,7 @@ describe LHC::Endpoint do
         it "#{url} should not match #{template}" do
           expect(
             LHC::Endpoint.match?(url, template)
-          ).not_to be
+          ).to be(false)
         end
       end
     end

data/spec/endpoint/placeholders_spec.rb

@@ -12,7 +12,7 @@ describe LHC::Endpoint do
     it 'allows basic auth token in url, like used on github' do
       stub_request(:get, "https://d123token:@api.github.com/search")
         .to_return(body: {}.to_json)
-      expect(->{
+      expect(-> {
         LHC.get("https://d123token:@api.github.com/search")
       }).not_to raise_error
     end
@@ -20,7 +20,7 @@ describe LHC::Endpoint do
     it 'allows complete basic auth (username password) in url, like used for the gemserer' do
       stub_request(:get, "https://name:password@gemserver.com")
         .to_return(body: {}.to_json)
-      expect(->{
+      expect(-> {
         LHC.get("https://name:password@gemserver.com")
       }).not_to raise_error
     end

data/spec/error/to_s_spec.rb

@@ -46,10 +46,10 @@ describe LHC::Error do
         double('request',
                method: 'GET',
                url: 'http://example.com/sessions',
-               headers: { 'Bearer Token' => "aaaaaaaa-bbbb-cccc-dddd-eeee"},
+               headers: { 'Bearer Token' => "aaaaaaaa-bbbb-cccc-dddd-eeee" },
                options: { followlocation: true,
-                          auth: { bearer: "aaaaaaaa-bbbb-cccc-dddd-eeee"},
-                          params: { limit: 20}, url: "http://example.com/sessions" })
+                          auth: { bearer: "aaaaaaaa-bbbb-cccc-dddd-eeee" },
+                          params: { limit: 20 }, url: "http://example.com/sessions" })
       end
 
       let(:response) do

data/spec/interceptors/after_response_spec.rb

@@ -4,12 +4,9 @@ describe LHC do
   context 'interceptor' do
     before(:each) do
       class Services
-        def self.timing(_path, _time)
-        end
+        def self.timing(_path, _time); end
       end
-    end
 
-    before(:each) do
       class StatsTimingInterceptor < LHC::Interceptor
         def after_response
           uri = URI.parse(response.request.url)

data/spec/interceptors/auth/reauthentication_configuration_spec.rb

@@ -0,0 +1,59 @@
+require 'rails_helper'
+
+describe LHC::Auth do
+  let(:bearer_token) { '123456' }
+
+  before(:each) do
+    stub_request(:get, 'http://local.ch').with(headers: { 'Authorization' => "Bearer #{bearer_token}" })
+  end
+
+  context "configuration check not happening" do
+    let(:options) { { bearer: bearer_token } }
+
+    before(:each) { LHC.config.interceptors = [LHC::Auth, LHC::Retry] }
+
+    it "max_recovery_attempts is zero" do
+      expect_any_instance_of(described_class).not_to receive(:warn)
+      LHC.config.endpoint(:local, 'http://local.ch', auth: options.merge(max_recovery_attempts: 0))
+      LHC.get(:local)
+    end
+
+    it "max_recovery_attempts is missing" do
+      expect_any_instance_of(described_class).not_to receive(:warn)
+      LHC.config.endpoint(:local, 'http://local.ch', auth: options)
+      LHC.get(:local)
+    end
+  end
+
+  context "configuration check happening" do
+    let(:options) { { bearer: bearer_token, max_recovery_attempts: 1, refresh_client_token: -> { "here comes your refresh code" } } }
+
+    it "no warning with proper options" do
+      LHC.config.interceptors = [LHC::Auth, LHC::Retry]
+      LHC.config.endpoint(:local, 'http://local.ch', auth: options)
+      expect_any_instance_of(described_class).not_to receive(:warn)
+      LHC.get(:local)
+    end
+
+    it "warn refresh_client_token is a string" do
+      LHC.config.interceptors = [LHC::Auth, LHC::Retry]
+      LHC.config.endpoint(:local, 'http://local.ch', auth: options.merge(refresh_client_token: bearer_token))
+      expect_any_instance_of(described_class).to receive(:warn).with("[WARNING] The given refresh_client_token must be a Proc for reauthentication.")
+      LHC.get(:local)
+    end
+
+    it "warn interceptors miss LHC::Retry" do
+      LHC.config.interceptors = [LHC::Auth]
+      LHC.config.endpoint(:local, 'http://local.ch', auth: options)
+      expect_any_instance_of(described_class).to receive(:warn).with("[WARNING] Your interceptors must include LHC::Retry after LHC::Auth.")
+      LHC.get(:local)
+    end
+
+    it "warn interceptors LHC::Retry before LHC::Auth" do
+      LHC.config.interceptors = [LHC::Retry, LHC::Auth]
+      LHC.config.endpoint(:local, 'http://local.ch', auth: options)
+      expect_any_instance_of(described_class).to receive(:warn).with("[WARNING] Your interceptors must include LHC::Retry after LHC::Auth.")
+      LHC.get(:local)
+    end
+  end
+end

data/spec/interceptors/auth/reauthentication_spec.rb

@@ -0,0 +1,32 @@
+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!(:auth_failing) do
+    stub_request(:get, 'http://local.ch')
+      .with(headers: { 'Authorization' => "Bearer #{initial_token}" })
+      .to_return(status: 401, body: "{}") # LHC::Unauthorized
+  end
+  let!(:auth_suceeding_after_recovery) do
+    stub_request(:get, 'http://local.ch')
+      .with(headers: { 'Authorization' => "Bearer #{refresh_token}" })
+  end
+
+  before(:each) do
+    LHC.config.interceptors = [LHC::Auth, LHC::Retry]
+  end
+
+  it "recovery is attempted" do
+    LHC.config.endpoint(:local, 'http://local.ch', auth: options)
+    # the retried request (with updated Bearer), that should work
+    LHC.get(:local)
+    expect(auth_suceeding_after_recovery).to have_been_made.once
+  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)
+  end
+end

data/spec/interceptors/caching/methods_spec.rb

@@ -5,14 +5,12 @@ describe LHC::Caching do
     LHC.config.interceptors = [LHC::Caching]
     LHC::Caching.cache = Rails.cache
     Rails.cache.clear
-  end
-
-  let!(:stub) { stub_request(:post, 'http://local.ch').to_return(status: 200, body: 'The Website') }
 
-  before(:each) do
     LHC.config.endpoint(:local, 'http://local.ch', cache: { expires_in: 5.minutes })
   end
 
+  let!(:stub) { stub_request(:post, 'http://local.ch').to_return(status: 200, body: 'The Website') }
+
   it 'only caches GET requests by default' do
     expect(Rails.cache).not_to receive(:write)
     LHC.post(:local)

data/spec/interceptors/caching/options_spec.rb

@@ -4,15 +4,14 @@ require 'rails_helper'
 # we need a class where we can setup method expectations
 # with `expect_any_instance`
 class CacheMock
-  def fetch(*_)
-  end
+  def fetch(*_); end
 
-  def write(*_)
-  end
+  def write(*_); end
 end
 
 describe LHC::Caching do
   let(:default_cache) { LHC::Caching.cache }
+
   before(:each) do
     stub_request(:get, 'http://local.ch').to_return(status: 200, body: 'The Website')
     LHC.config.interceptors = [LHC::Caching]
@@ -26,7 +25,7 @@ describe LHC::Caching do
     expect(lambda {
       LHC.get('http://local.ch', cache: true, cache_expires_in: 5.minutes, cache_key: 'key', cache_race_condition_ttl: 15.seconds)
     }).to output(
-      %r{Cache options have changed! cache_expires_in, cache_key, cache_race_condition_ttl are deprecated and will be removed in future versions.}
+      /Cache options have changed! cache_expires_in, cache_key, cache_race_condition_ttl are deprecated and will be removed in future versions./
     ).to_stderr
   end
 

data/spec/interceptors/monitoring/main_spec.rb

@@ -5,11 +5,9 @@ describe LHC::Monitoring do
   let(:endpoint_configuration) { LHC.config.endpoint(:local, 'http://local.ch') }
 
   module Statsd
-    def self.count(_path, _value)
-    end
+    def self.count(_path, _value); end
 
-    def self.timing(_path, _value)
-    end
+    def self.timing(_path, _value); end
   end
 
   before(:each) do

data/spec/interceptors/zipkin/distributed_tracing_spec.rb

@@ -100,7 +100,7 @@ describe LHC::Zipkin do
 
       it 'does register a new span' do
         # ensure a span was registered, by checking call on span
-        expect_any_instance_of(described_class).to receive(:span).at_least(1).times.and_call_original
+        expect_any_instance_of(described_class).to receive(:span).at_least(:once).and_call_original
         LHC.get(:local)
       end
     end

data/spec/request/ignore_errors_spec.rb

@@ -3,6 +3,7 @@ require 'rails_helper'
 describe LHC::Request do
   context 'ignoring LHC::NotFound' do
     let(:response) { LHC.get('http://local.ch', ignored_errors: [LHC::NotFound]) }
+
     before { stub_request(:get, 'http://local.ch').to_return(status: 404) }
 
     it 'does not raise an error' do

data/spec/response/success_spec.rb

@@ -5,7 +5,7 @@ describe LHC::Response do
     let(:response_success) { LHC::Response.new(Typhoeus::Response.new(response_code: 200, mock: true), nil) }
     let(:response_error) { LHC::Response.new(Typhoeus::Response.new(response_code: 404, mock: true), nil) }
 
-    it { expect(response_success.success?).to be_truthy }
-    it { expect(response_error.success?).to be_falsy }
+    it { expect(response_success).to be_success }
+    it { expect(response_error).not_to be_success }
   end
 end

data/spec/response/time_spec.rb

@@ -11,7 +11,7 @@ describe LHC::Response do
       expect(response.time).to eq time * 1000
     end
 
-    it 'provides response time in seconds' do
+    it 'provides response time in miliseconds' do
       response = LHC::Response.new(raw_response, nil)
       expect(response.time_ms).to eq time
     end

data/spec/support/zipkin_mock.rb

@@ -55,11 +55,9 @@ module ZipkinTracer
   end
 
   class Span
-    def record_tag(*)
-    end
+    def record_tag(*); end
 
-    def record(*)
-    end
+    def record(*); end
   end
 end
 

metadata

@@ -1,87 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.3.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: geminabox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,75 +95,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: geminabox
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.57.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.57.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
-  name: prometheus-client
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 description: 'Rails gem for HTTP: Wraps typhoeus and provides additional features
   (like interceptors)'
 email:
@@ -302,6 +302,8 @@ files:
 - spec/interceptors/after_response_spec.rb
 - spec/interceptors/auth/basic_auth_spec.rb
 - spec/interceptors/auth/bearer_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
@@ -363,7 +365,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -372,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: LocalHttpClient
@@ -440,6 +442,8 @@ test_files:
 - spec/interceptors/after_response_spec.rb
 - spec/interceptors/auth/basic_auth_spec.rb
 - spec/interceptors/auth/bearer_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