lhc 12.2.0 → 13.2.0

data/spec/interceptors/response_competition_spec.rb

@@ -12,7 +12,7 @@ describe LHC do
 
         def before_request
           if @@cached
-            return LHC::Response.new(Typhoeus::Response.new(response_body: 'Im served from local cache'), nil)
+            return LHC::Response.new(Typhoeus::Response.new(response_code: 200, return_code: :ok, response_body: 'Im served from local cache'), nil)
           end
         end
       end
@@ -22,7 +22,7 @@ describe LHC do
 
         def before_request
           if request.response.nil?
-            return LHC::Response.new(Typhoeus::Response.new(response_body: 'Im served from remote cache'), nil)
+            return LHC::Response.new(Typhoeus::Response.new(response_code: 200, return_code: :ok, response_body: 'Im served from remote cache'), nil)
           end
         end
       end

data/spec/interceptors/return_response_spec.rb

@@ -8,7 +8,7 @@ describe LHC do
       class CacheInterceptor < LHC::Interceptor
 
         def before_request
-          LHC::Response.new(Typhoeus::Response.new(response_body: 'Im served from cache'), nil)
+          LHC::Response.new(Typhoeus::Response.new(response_code: 200, return_code: :ok, response_body: 'Im served from cache'), nil)
         end
       end
       LHC.configure { |c| c.interceptors = [CacheInterceptor] }
@@ -23,7 +23,7 @@ describe LHC do
       before(:each) do
         class AnotherInterceptor < LHC::Interceptor
           def before_request
-            LHC::Response.new(Typhoeus::Response.new({}), nil)
+            LHC::Response.new(Typhoeus::Response.new(response_code: 200, return_code: :ok), nil)
           end
         end
       end

data/spec/interceptors/throttle/main_spec.rb

@@ -100,35 +100,95 @@ describe LHC::Throttle do
     end
   end
 
-  describe 'calculate "remaining" in proc' do
-    let(:quota_current) { 8100 }
-    let(:options_remaining) do
-      ->(response) { (response.headers['limit']).to_i - (response.headers['current']).to_i }
+  describe 'configuration values as Procs' do
+    describe 'calculate "limit" in proc' do
+      let(:options_limit) do
+        ->(*) { 10_000 }
+      end
+
+      before(:each) do
+        LHC.get('http://local.ch', options)
+      end
+
+      context 'breaks' do
+        let(:options_break) { '80%' }
+
+        it 'hit the breaks if throttling quota is reached' do
+          expect { LHC.get('http://local.ch', options) }.to raise_error(
+            LHC::Throttle::OutOfQuota,
+            'Reached predefined quota for local.ch'
+          )
+        end
+
+        context 'still within quota' do
+          let(:options_break) { '90%' }
+
+          it 'does not hit the breaks' do
+            LHC.get('http://local.ch', options)
+          end
+        end
+      end
     end
 
-    before(:each) do
-      stub_request(:get, 'http://local.ch').to_return(
-        headers: { 'limit' => quota_limit, 'current' => quota_current, 'reset' => quota_reset }
-      )
-      LHC.get('http://local.ch', options)
+    describe 'calculate "remaining" in proc' do
+      let(:quota_current) { 8100 }
+      let(:options_remaining) do
+        ->(response) { (response.headers['limit']).to_i - (response.headers['current']).to_i }
+      end
+
+      before(:each) do
+        stub_request(:get, 'http://local.ch').to_return(
+          headers: { 'limit' => quota_limit, 'current' => quota_current, 'reset' => quota_reset }
+        )
+        LHC.get('http://local.ch', options)
+      end
+
+      context 'breaks' do
+        let(:options_break) { '80%' }
+
+        it 'hit the breaks if throttling quota is reached' do
+          expect { LHC.get('http://local.ch', options) }.to raise_error(
+            LHC::Throttle::OutOfQuota,
+            'Reached predefined quota for local.ch'
+          )
+        end
+
+        context 'still within quota' do
+          let(:options_break) { '90%' }
+
+          it 'does not hit the breaks' do
+            LHC.get('http://local.ch', options)
+          end
+        end
+      end
     end
 
-    context 'breaks' do
-      let(:options_break) { '80%' }
+    describe 'calculate "reset" in proc' do
+      let(:options_expires) { ->(*) { Time.zone.now + 1.second } }
 
-      it 'hit the breaks if throttling quota is reached' do
-        expect { LHC.get('http://local.ch', options) }.to raise_error(
-          LHC::Throttle::OutOfQuota,
-          'Reached predefined quota for local.ch'
+      before(:each) do
+        stub_request(:get, 'http://local.ch').to_return(
+          headers: { 'limit' => quota_limit, 'remaining' => quota_remaining }
         )
+        LHC.get('http://local.ch', options)
       end
 
-      context 'still within quota' do
-        let(:options_break) { '90%' }
+      context 'breaks' do
+        let(:options_break) { '80%' }
 
-        it 'does not hit the breaks' do
-          LHC.get('http://local.ch', options)
-          LHC.get('http://local.ch', options)
+        it 'hit the breaks if throttling quota is reached' do
+          expect { LHC.get('http://local.ch', options) }.to raise_error(
+            LHC::Throttle::OutOfQuota,
+            'Reached predefined quota for local.ch'
+          )
+        end
+
+        context 'still within quota' do
+          let(:options_break) { '90%' }
+
+          it 'does not hit the breaks' do
+            LHC.get('http://local.ch', options)
+          end
         end
       end
     end
@@ -154,9 +214,23 @@ describe LHC::Throttle do
 
         it 'does not hit the breaks' do
           LHC.get('http://local.ch', options)
-          LHC.get('http://local.ch', options)
         end
       end
     end
   end
+
+  context 'when value is empty' do
+    let(:quota_reset) { nil }
+
+    before do
+      stub_request(:get, 'http://local.ch').to_return(
+        headers: { 'limit' => quota_limit, 'remaining' => quota_remaining }
+      )
+      LHC.get('http://local.ch', options)
+    end
+
+    it 'still runs' do
+      LHC.get('http://local.ch', options)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'pry'
 require 'webmock/rspec'
 require 'lhc'
+require 'lhc/rspec'
 require 'timecop'
 
 Dir[File.join(__dir__, "support/**/*.rb")].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 13.2.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: redis
+  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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -188,29 +202,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.localch.yml"
 - ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
-- Gemfile.activesupport4
 - Gemfile.activesupport5
 - Gemfile.activesupport6
 - LICENSE
 - README.md
 - Rakefile
-- cider-ci.yml
-- cider-ci/bin/bundle
-- cider-ci/bin/ruby_install
-- cider-ci/bin/ruby_version
-- cider-ci/jobs/rspec-activesupport-4.yml
-- cider-ci/jobs/rspec-activesupport-5.yml
-- cider-ci/jobs/rspec-activesupport-6.yml
-- cider-ci/jobs/rubocop.yml
-- cider-ci/task_components/bundle.yml
-- cider-ci/task_components/rspec.yml
-- cider-ci/task_components/rubocop.yml
-- cider-ci/task_components/ruby.yml
 - friday.yml
 - lhc.gemspec
 - lib/core_ext/hash/deep_transform_values.rb
@@ -335,6 +338,7 @@ files:
 - 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
@@ -344,6 +348,7 @@ files:
 - 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
@@ -405,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby >= 2.0.0
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Advanced HTTP Client for Ruby, fueled with interceptors
@@ -488,6 +493,7 @@ test_files:
 - 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
@@ -497,6 +503,7 @@ test_files:
 - 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

data/Gemfile.activesupport4

@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-
-gemspec
-gem 'activesupport', '~> 4.2.11'

data/cider-ci.yml

@@ -1,6 +0,0 @@
-jobs:
-  include:
-    - cider-ci/jobs/rspec-activesupport-4.yml
-    - cider-ci/jobs/rspec-activesupport-5.yml
-    - cider-ci/jobs/rspec-activesupport-6.yml
-    - cider-ci/jobs/rubocop.yml

data/cider-ci/bin/bundle

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-export PATH=~/.rubies/$RUBY/bin:$PATH
-rm -f .bundle/config
-
-if [ ! -f ~/.rubies/$RUBY/bin/bundle ]; then
-  gem install bundler
-fi
-
-# install bundler v. 1.17.3 in order to be able to run the tests with
-# ACTIVESUPPORT=4 because rails (= 4.2.0) depends on bundler (< 2.0, >= 1.3.0)
-gem install bundler:1.17.3
-
-sed "s/^source 'https:\/\/rubygems\.intra\.local\.ch'*/source 'http\:\/\/52.29.7.59:9292'/g" Gemfile > Gemfile.tmp
-mv Gemfile.tmp Gemfile
-
-DIGEST=$(git ls-tree HEAD --\
-  cider-ci.yml cider-ci Gemfile.lock \
-  | openssl dgst -sha1 | cut -d ' ' -f 2)
-
-if [ ! -z ${ACTIVESUPPORT:-} ]; then
-  DIGEST=$(echo "$DIGEST $ACTIVESUPPORT")
-fi
-
-DIGEST=$(echo "$DIGEST $PATH" \
- | openssl dgst -sha1 | cut -d ' ' -f 2)
-
-echo "DIGEST"
-echo "${DIGEST}"
-
-CACHE_SIGNATURE_FILE="/tmp/bundle_cache_signature_${DIGEST}"
-
-if [ ! -f  $CACHE_SIGNATURE_FILE ] ; then
-  if [ ! -z ${ACTIVESUPPORT:-} ]; then
-    if [ ! -z ${BUNDLER:-} ]; then
-      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install"
-      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install
-    else
-      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install"
-      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install
-    fi
-  else
-    echo "bundle install"
-    bundle $BUNDLER install
-  fi
-  touch $CACHE_SIGNATURE_FILE
-fi
-
-echo "bundle install"
-bundle $BUNDLER install

data/cider-ci/bin/ruby_install

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-export PATH=~/.rubies/$RUBY/bin:$PATH
-
-if [ ! -d ~/.rubies/$RUBY ]; then
-  ruby-install --no-install-deps $RUBY
-fi

data/cider-ci/bin/ruby_version

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-if [ -f ./.ruby-version ]; then
- echo ".ruby-version file found"
-fi
-
-if [ ! -f ./.ruby-version ]; then
-  echo ".ruby-version file not found" 
-  exit 1
-fi 
-
-IFS='-' read -ra EXPLODED_RUBY <<< "$RUBY"
-
-if [ "${#EXPLODED_RUBY[@]}" == "1" ]; then
-  echo 'No engine/version separator "-" found in .ruby-version file.'
-  exit 1
-fi
-
-if [ "${#EXPLODED_RUBY[@]}" != "1" ] && [ "${#EXPLODED_RUBY[@]}" != "2" ]; then
-  echo "Unknown format of .ruby-version file"
-  exit 1
-fi
-
-echo $RUBY

data/cider-ci/jobs/rspec-activesupport-4.yml

@@ -1,28 +0,0 @@
-rspec-active-support-v4:
-  name: 'rspec with ActiveSupport v4'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    script_defaults:
-      template_environment_variables: true
-
-    task_defaults:
-      environment_variables:
-        ACTIVESUPPORT: '4'
-        BUNDLER: '_1.17.3_'
-
-      max_trials: 2
-      dispatch_storm_delay_duration: 1 Seconds
-      include:
-        - cider-ci/task_components/ruby.yml
-        - cider-ci/task_components/bundle.yml
-        - cider-ci/task_components/rspec.yml
-
-    tasks:
-      all-rspec:
-        name: All rspec tests, using ActiveSupport v4