dhc 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e0bb9f278c6894075dfd3004f3a639be1d5da7dd02df7b4e6d3f6169ee33ef
-  data.tar.gz: f3ee060e925fca3a629f8ca3c53e815c9c33bcb6dcbba75ff57651d1f57595e2
+  metadata.gz: dbcbbfbe466771c1ad389aebe29d997915137216b50b0aceff73f3cbc589f050
+  data.tar.gz: a659a0b022d803a700352d20fe96482731470b31234e8db9df3f665da5547ae7
 SHA512:
-  metadata.gz: fbdd2700bd73f043a0d6aa4f37c2505255451be5fd6228df2013951df03f63c3dd964116bcf5a7c05a273a28025d06cab319aca08f19fa7339a7eb349e39c9a9
-  data.tar.gz: 99800e3225e33e433218698f075c492be9fa6f59d11c457a09ab3558eabbebb5ecb68b15ed796c2ffea6803cd02199f3d1ffda3d52717a8f0e543e56b55c6982
+  metadata.gz: 1851454238cb9552457a56c020edcb88b8b7e37eed6ebc0c6d1a8574c8250c520cfd48d8ca1e9f82ddcd334085daf1651fb0c31221ea638921aeb5873218846f
+  data.tar.gz: 4432965dcb69081d1d082cfc47101644a817f387d79213f57b8d2b80192901148e49b6a9ceb4ddb10c632e425385b30026de4c2bbbe69ffdaeefb5bf105c6bf5

data/dhc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'prometheus-client', '~> 0.7.1'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rails', '>= 5.2'
+  s.add_development_dependency 'rails', '>= 5.2', '< 7'
   s.add_development_dependency 'redis'
   s.add_development_dependency 'rspec-rails', '>= 3.0.0'
   s.add_development_dependency 'rubocop'

data/lib/dhc/interceptors/caching.rb

@@ -23,12 +23,12 @@ class DHC::Caching < DHC::Interceptor
     def fetch(key)
       central_response = @central[:read].fetch(key) if @central && @central[:read].present?
       if central_response
-        puts %([DHC] served from central cache: "#{key}")
+        DHC::Logger.info %([DHC] served from central cache: "#{key}")
         return central_response
       end
       local_response = @local.fetch(key) if @local
       if local_response
-        puts %([DHC] served from local cache: "#{key}")
+        DHC::Logger.info %([DHC] served from local cache: "#{key}")
         return local_response
       end
     end

data/lib/dhc/logger.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'singleton'
+require 'forwardable'
+
+class DHC::Logger < Logger
+  include ActiveSupport::Configurable
+  include Singleton
+
+  config_accessor :logger
+
+  class << self
+    extend Forwardable
+    def_delegators :instance, :log, :info, :error, :warn, :debug
+  end
+
+  def initialize(logdev = nil)
+    super
+    if DHC::Logger.logger
+      self.logger = DHC::Logger.logger
+    elsif defined? Rails
+      self.logger = Rails.logger
+    end
+  end
+
+  def self.log(severity, message = nil, progname = nil)
+    return if logger.blank?
+    logger.log(severity, message, progname)
+  end
+end

data/lib/dhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DHC
-  VERSION ||= '2.1.1'
+  VERSION ||= '2.2.0'
 end

data/lib/dhc.rb

@@ -72,6 +72,7 @@ module DHC
   autoload :Response, 'dhc/response'
   autoload :Rollbar, 'dhc/interceptors/rollbar'
   autoload :Zipkin, 'dhc/interceptors/zipkin'
+  autoload :Logger, 'dhc/logger'
 
   require 'dhc/railtie' if defined?(Rails)
 end

data/spec/interceptors/caching/multilevel_cache_spec.rb

@@ -46,8 +46,8 @@ describe DHC::Caching do
     it 'serves a response from local cache without trying the central cache' do
       expect(Rails.cache).to receive(:fetch).at_least(:once).and_call_original
       expect(Rails.cache).to receive(:write).and_call_original
-      expect(-> { response_has_been_cached_and_served_from_cache! })
-        .to output(%{[DHC] served from local cache: "DHC_CACHE(v1): GET http://depay.fi"\n}).to_stdout
+      expect(DHC::Logger).to receive(:info).with(%{[DHC] served from local cache: "DHC_CACHE(v1): GET http://depay.fi"}).and_call_original
+      response_has_been_cached_and_served_from_cache!
     end
   end
 
@@ -67,8 +67,8 @@ describe DHC::Caching do
         expect(redis_cache).to receive(:write).and_return(true)
         expect(Rails.cache).to receive(:fetch).and_call_original
         expect(Rails.cache).to receive(:write).and_call_original
-        expect(-> { response_has_been_cached_and_served_from_cache! })
-          .to output(%{[DHC] served from central cache: "DHC_CACHE(v1): GET http://depay.fi"\n}).to_stdout
+        expect(DHC::Logger).to receive(:info).with(%{[DHC] served from central cache: "DHC_CACHE(v1): GET http://depay.fi"}).and_call_original
+        response_has_been_cached_and_served_from_cache!
       end
     end
 
@@ -78,8 +78,8 @@ describe DHC::Caching do
         expect(redis_cache).to receive(:write).and_return(true)
         expect(Rails.cache).to receive(:fetch).at_least(:once).and_call_original
         expect(Rails.cache).to receive(:write).and_call_original
-        expect(-> { response_has_been_cached_and_served_from_cache! })
-          .to output(%{[DHC] served from local cache: "DHC_CACHE(v1): GET http://depay.fi"\n}).to_stdout
+        expect(DHC::Logger).to receive(:info).with(%{[DHC] served from local cache: "DHC_CACHE(v1): GET http://depay.fi"}).and_call_original
+        response_has_been_cached_and_served_from_cache!
       end
     end
   end
@@ -97,8 +97,8 @@ describe DHC::Caching do
       expect(redis_cache).not_to receive(:write)
       expect(Rails.cache).to receive(:fetch).and_call_original
       expect(Rails.cache).to receive(:write).and_call_original
-      expect(-> { response_has_been_cached_and_served_from_cache! })
-        .to output(%{[DHC] served from central cache: "DHC_CACHE(v1): GET http://depay.fi"\n}).to_stdout
+      expect(DHC::Logger).to receive(:info).with(%{[DHC] served from central cache: "DHC_CACHE(v1): GET http://depay.fi"}).and_call_original
+      response_has_been_cached_and_served_from_cache!
     end
   end
 
@@ -115,8 +115,8 @@ describe DHC::Caching do
       expect(redis_cache).to receive(:write).and_return(true)
       expect(Rails.cache).to receive(:fetch).at_least(:once).and_call_original
       expect(Rails.cache).to receive(:write).and_call_original
-      expect(-> { response_has_been_cached_and_served_from_cache! })
-        .to output(%{[DHC] served from local cache: "DHC_CACHE(v1): GET http://depay.fi"\n}).to_stdout
+      expect(DHC::Logger).to receive(:info).with(%{[DHC] served from local cache: "DHC_CACHE(v1): GET http://depay.fi"}).and_call_original
+      response_has_been_cached_and_served_from_cache!
     end
   end
 
@@ -132,8 +132,8 @@ describe DHC::Caching do
     it 'does not inquire the local cache for information neither to write them' do
       expect(redis_cache).to receive(:fetch).and_return(nil, body: '<h1>Hi there</h1>', code: 200, headers: nil, return_code: nil, mock: :webmock)
       expect(redis_cache).to receive(:write).and_return(true)
-      expect(-> { response_has_been_cached_and_served_from_cache! })
-        .to output(%{[DHC] served from central cache: "DHC_CACHE(v1): GET http://depay.fi"\n}).to_stdout
+      expect(DHC::Logger).to receive(:info).with(%{[DHC] served from central cache: "DHC_CACHE(v1): GET http://depay.fi"}).and_call_original
+      response_has_been_cached_and_served_from_cache!
     end
   end
 end

data/spec/interceptors/throttle/manually_spec.rb

@@ -81,19 +81,18 @@ describe DHC::Throttle do
   end
 
   context 'multiple provider' do
-
     it 'tracks multiple providers without a problem' do
       DHC.get('http://depay.fi', options)
       stub_request(:get, 'http://depay.app').to_return(status: 200)
       DHC.get('http://depay.app', {
-        throttle: {
-          provider: 'depay.app',
-          track: true,
-          limit: quota_limit,
-          expires: 1.minute,
-          break: break_after
-        }
-      })
+                throttle: {
+                  provider: 'depay.app',
+                  track: true,
+                  limit: quota_limit,
+                  expires: 1.minute,
+                  break: break_after
+                }
+              })
       expect(Rails.cache.read('DHC/throttle/tracker/v1')['depay.fi']).to be_present
       expect(Rails.cache.read('DHC/throttle/tracker/v1')['depay.app']).to be_present
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhc
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - https://github.com/DePayFi/dhc/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +237,7 @@ files:
 - lib/dhc/interceptors/rollbar.rb
 - lib/dhc/interceptors/throttle.rb
 - lib/dhc/interceptors/zipkin.rb
+- lib/dhc/logger.rb
 - lib/dhc/railtie.rb
 - lib/dhc/request.rb
 - lib/dhc/response.rb