gorynich 1.2.3.198656 → 1.3.0.213297

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f3734f146fa75d100e86a78a9f832261baba91b8cb2a36847b1691b569d7dad
-  data.tar.gz: 2460d2f46d994ef0524379f05e8888cceed81a1749047fbf426e11e1c5388ba4
+  metadata.gz: 3058d25e339ef8fa032918319885a98066b37f8b70e259d34f1ae511031ef8b2
+  data.tar.gz: 623452668fd141e1284f8b2c64cfd5966e87a79d38cbd9bf8380f1e98b13f045
 SHA512:
-  metadata.gz: c393942be3e141d01fcde9a8f5c67904f5ecbe41fd80a66b83f39f29fe1aae381e984f27668d2bb89273aab990dc959182aeb6dec3251ac2be22f1d58444ccb2
-  data.tar.gz: '0296fa69c0de6a81748473c12429111b706d69ffc52d03e467096ab828ea43b692cb57be0ebffe373f5391405c81c78b679cfeaf5b180942e485b5ae72a1af49'
+  metadata.gz: fd8754400d364dd584afb5900008d3c6e6fa78ef1ddb5a8b2705584f12495671da2ef309446a69924aa1224b9cb1e5c2631672c05bb7767cfb6188e9a7feedc9
+  data.tar.gz: a2108c1c6841be869fbffe671141f502bfb2ad5f06e88240a61cb4aeb4aa3422c7b2b60c237f111ad7eb5c6d6f00f55a4a6b6bbcb99882741bf1797ea94ab5ff

data/lib/gorynich/fetcher.rb

@@ -26,7 +26,7 @@ module Gorynich
     #
     def fetch
       cfg = Gorynich.configuration.cache.fetch(
-        %i[gorynich fetcher fetch], expires_in: @cache_expiration.seconds, namespace: @namespace
+        cache_key, expires_in: @cache_expiration.seconds, namespace: @namespace
       ) do
         if @fetcher.nil?
           {}
@@ -51,5 +51,18 @@ module Gorynich
 
       cfg.deep_transform_keys(&:downcase)
     end
+
+    #
+    # Delete cache
+    #
+    def reset
+      Gorynich.configuration.cache.delete(cache_key)
+    end
+
+    private
+
+    def cache_key
+      %i[gorynich fetcher fetch]
+    end
   end
 end

data/lib/gorynich/head/rack_middleware.rb

@@ -7,9 +7,6 @@ module Gorynich
       end
 
       def call(env)
-        @config ||= Gorynich.instance
-        @config.actualize
-
         tenant, opts = Gorynich.switcher.analyze(env)
 
         Gorynich.with(tenant, **opts) do

data/lib/gorynich/switcher.rb

@@ -1,5 +1,7 @@
 module Gorynich
   class Switcher
+    DATABASE_RETRY_LIMIT = 2
+
     def initialize(config:)
       @config = config
     end
@@ -20,14 +22,30 @@ module Gorynich
       [tenant, { host: host, uri: uri }]
     end
 
+    #
+    # Connect to database
+    #
+    # @param [String, Symbol] tenant Tenant (database role)
+    #
     def with_database(tenant)
+      retries ||= 0
       ::ActiveRecord::Base.connected_to role: tenant.to_sym do
         ::ActiveRecord::Base.connection_pool.with_connection do
           yield(tenant)
         end
       end
     rescue ::ActiveRecord::ConnectionNotEstablished => e
-      raise TenantNotFound, tenant unless ::Gorynich.instance.tenants.include?(tenant.to_s)
+      config = ::Gorynich.instance
+      config.actualize
+
+      raise TenantNotFound, tenant unless config.tenants.include?(tenant.to_s)
+      if (retries += 1) < DATABASE_RETRY_LIMIT
+        ActiveRecord::Base.connection_handler.establish_connection(
+          config.database(tenant), role: tenant.to_sym
+        )
+
+        retry
+      end
 
       raise e
     end

data/lib/gorynich/version.rb

@@ -1,3 +1,3 @@
 module Gorynich
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

data/spec/lib/gorynich/fetcher_spec.rb

@@ -109,4 +109,18 @@ RSpec.describe Gorynich::Fetcher do
       expect(Gorynich.configuration.cache.exist?(%i[gorynich fetcher fetch])).to be(true)
     end
   end
+
+  describe '#reset' do
+    let(:fetcher) { Gorynich::Fetchers::File.new(file_path: file_path) }
+
+    subject { described_class.new(fetcher: fetcher) }
+
+    it do
+      subject.fetch
+      expect(Gorynich.configuration.cache.exist?(%i[gorynich fetcher fetch])).to be(true)
+
+      subject.reset
+      expect(Gorynich.configuration.cache.exist?(%i[gorynich fetcher fetch])).to be(false)
+    end
+  end
 end

data/spec/lib/gorynich/switcher_spec.rb

@@ -0,0 +1,46 @@
+RSpec.describe Gorynich::Switcher do
+  let(:config) do
+    {
+      'test' => {
+        'default' => {
+          'db_config' => {},
+          'secrets'   =>   {}
+        }
+      }
+    }
+  end
+  let(:fetcher) { HashFetcher.new(**config) }
+  let(:gorynich_config) { Gorynich::Config.new(fetcher: fetcher) }
+
+  subject { described_class.new(config: gorynich_config) }
+
+  describe '#with_database' do
+    context 'when tenant not found' do
+      it do
+        expect(::ActiveRecord::Base).to receive(:connected_to).with(role: :test).and_raise(
+          ::ActiveRecord::ConnectionNotEstablished
+        )
+        expect { subject.with_database('test') }.to raise_error(Gorynich::TenantNotFound)
+      end
+    end
+
+    context 'when have tenant but ConnectionNotEstablished' do
+      before(:each) do
+        allow(::Gorynich).to receive(:instance).and_return(gorynich_config)
+      end
+
+      it do
+        expect(::ActiveRecord::Base).to receive(:connected_to).with(role: :default).and_raise(
+          ::ActiveRecord::ConnectionNotEstablished
+        )
+        expect_any_instance_of(
+          ::ActiveRecord::ConnectionAdapters::ConnectionHandler
+        ).to receive(:establish_connection).with(
+          gorynich_config.database('default'), role: :default
+        )
+        expect(::ActiveRecord::Base).to receive(:connected_to)
+        subject.with_database('default')
+      end
+    end
+  end
+end

data/spec/rails_helper.rb

@@ -3,6 +3,6 @@ require File.expand_path('dummy/config/environment.rb', __dir__)
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'rspec/rails'
 
-# это надо для програзки классов и корректного рассчёта SimpleCov. Без него мы теряем целый процент!!
+# это надо для прогрузки классов и корректного рассчёта SimpleCov. Без него мы теряем целый процент!!
 Rails.application.eager_load!
 require 'gorynich'

data/spec/spec_helper.rb

@@ -21,14 +21,14 @@ unless %w[F FALSE 0].include? ENV['COVERAGE'].to_s.upcase
       source_file.src.first&.match(/skip coverage/)
     end
   end
-  
+
   if ENV['TEST_ENV_NUMBER'] # parallel specs
     SimpleCov.at_exit do
       result = SimpleCov.result
       result.format! if ParallelTests.number_of_running_processes <= 1
     end
   end
-  
+
 end
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/helpers/hash_fetcher.rb

@@ -0,0 +1,11 @@
+class HashFetcher
+  attr_accessor :data
+
+  def initialize(**opts)
+    @data = opts
+  end
+
+  def fetch
+    data
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorynich
 version: !ruby/object:Gem::Version
-  version: 1.2.3.198656
+  version: 1.3.0.213297
 platform: ruby
 authors:
 - Poliev Alexey
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -362,10 +362,12 @@ files:
 - spec/lib/gorynich/fetchers/consul_secure_spec.rb
 - spec/lib/gorynich/fetchers/consul_spec.rb
 - spec/lib/gorynich/fetchers/file_spec.rb
+- spec/lib/gorynich/switcher_spec.rb
 - spec/lib/gorynich/version_spec.rb
 - spec/lib/gorynich_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/support/helpers/hash_fetcher.rb
 homepage: https://github.com/RND-SOFT/gorynich
 licenses:
 - MIT
@@ -385,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Multitenancy for Rails and subsystems
@@ -455,7 +457,9 @@ test_files:
 - spec/lib/gorynich/fetchers/consul_secure_spec.rb
 - spec/lib/gorynich/fetchers/consul_spec.rb
 - spec/lib/gorynich/fetchers/file_spec.rb
+- spec/lib/gorynich/switcher_spec.rb
 - spec/lib/gorynich/version_spec.rb
 - spec/lib/gorynich_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/support/helpers/hash_fetcher.rb