gorynich 1.3.1.213701 → 1.3.3.231946

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6944787fa4c53d57576e3b97174172fa72f574f0edbecc6d46050d95931ece0
-  data.tar.gz: bf6c3303108da3e602ac6c8c88bbc4bbd7c3798d604dfd19e497fef3bafd15dc
+  metadata.gz: c580367795e9f7b4337327a151bb380c0beb210126b4c3382f9cd9179b517b6f
+  data.tar.gz: 072e6a4cdf3f7948c7861ca53d5c94075d451302ad837acbfdea90dcbc6d4a26
 SHA512:
-  metadata.gz: b54228e2022034e17aa3ed999867a6b46e9d067bdfc72197db207e590b962b6c8a8be942398fde80ca9c947f884edd76dfef265e0ae522143f0660bb8e88fb03
-  data.tar.gz: 4910edf74f309b7a9696a79fbc5d9c51dc4358d74b2c44254a31ffd02c265e8a57c12dd76a2696246510b6eabbbe9422fbd6fa4ce85f1e7ca04c456bc210c460
+  metadata.gz: b5a314c932a44623e787e77858e247127e7f437bd77f1d0888767579c63c6908467f7baafcafc03c8d82476ea0131ecd59713207e71920b6a6a2522af8ae2878
+  data.tar.gz: 42332bba266151eda388aa3dea13904806721d29b9d9e3f4a1e295ec23f5b62e16def75dacf5151fafbf78eb95c7d2ab779a61ae089b0b7dac2eb2e903de1303

data/lib/gorynich/config.rb

@@ -126,13 +126,17 @@ module Gorynich
 
     #
     # Database config for database.yml
+    # If used <%= Gorynich.instance.database_config(your_enviroment) %> without gorynich config it will raise an error.
+    # You can use <%= Gorynich.instance.database_config(your_enviroment, fail_ignore: true) %> if there is no configuration for the environment
+    # and dummy_value depending on whether you have a configuration in the database.yml under this environment (dummy_value: nil when there is and dummy_value: {} if there is not. Default dummy_value is nil)
     #
     # @param [String] env enviroment
-    # @param [Boolean] with_ignore ignore if there is no configuration for the environment
+    # @param [Boolean] fail_ignore ignore if there is no configuration for the environment
+    # @param [nil or Hash] dummy_value value for YAML if there is no config.
     #
     # @return [String] yaml result
     #
-    def database_config(env = nil, fail_ignore: false)
+    def database_config(env = nil, fail_ignore: false, dummy_value: nil)
       envs = Dir.glob(Rails.root.join('config/environments/*.rb').to_s).map { |f| File.basename(f, '.rb') }
       cfg = fetcher.fetch.extract!(*envs)
 
@@ -145,8 +149,8 @@ module Gorynich
             ]
           end
         else
-          if fail_ignore && cfg.fetch(env, nil).nil?
-            { env => nil}
+          if fail_ignore && cfg[env].nil?
+            { env => dummy_value }
           else
             {
               env => configs_sort(cfg.fetch(env)).to_h { |t, c| [t, c.fetch('db_config')] }

data/lib/gorynich/configuration.rb

@@ -1,5 +1,14 @@
 module Gorynich
   class Configuration
+    #
+    # Cache dummy
+    #
+    class NullStore
+      def fetch(*args, **kwargs, &block)
+        block.call
+      end
+    end
+
     attr_accessor :cache,
                   :fetcher,
                   :namespace,
@@ -7,7 +16,7 @@ module Gorynich
                   :rack_env_handler
 
     def initialize
-      @cache = ActiveSupport::Cache::NullStore.new
+      @cache = NullStore.new
       @fetcher = nil
       @namespace = nil
       @cache_expiration = 30

data/lib/gorynich/version.rb

@@ -1,3 +1,3 @@
 module Gorynich
-  VERSION = '1.3.1'
+  VERSION = '1.3.3'
 end

data/spec/lib/gorynich/fetcher_spec.rb

@@ -1,4 +1,8 @@
 RSpec.describe Gorynich::Fetcher do
+  before(:each) do
+    Gorynich.configuration.cache = ActiveSupport::Cache::NullStore.new
+  end
+
   let(:file_path) { "#{RSPEC_ROOT}/fixtures/fetchers/file_config.yml" }
   let(:consul_storage) { Faker::Lorem.word }
   let(:consul_host) { Faker::Internet.url }
@@ -105,8 +109,9 @@ RSpec.describe Gorynich::Fetcher do
     subject { described_class.new(fetcher: fetcher) }
 
     it do
-      expect(subject.fetch).to include('development', 'test')
-      expect(Gorynich.configuration.cache.exist?(%i[gorynich fetcher fetch])).to be(true)
+      allow(Gorynich.configuration.cache).to receive(:fetch).and_return({test: true})
+      expect(Gorynich.configuration.cache).to receive(:fetch)
+      subject.fetch
     end
   end
 
@@ -116,11 +121,9 @@ RSpec.describe Gorynich::Fetcher do
     subject { described_class.new(fetcher: fetcher) }
 
     it do
-      subject.fetch
-      expect(Gorynich.configuration.cache.exist?(%i[gorynich fetcher fetch])).to be(true)
+      expect(Gorynich.configuration.cache).to receive(:delete)
 
       subject.reset
-      expect(Gorynich.configuration.cache.exist?(%i[gorynich fetcher fetch])).to be(false)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorynich
 version: !ruby/object:Gem::Version
-  version: 1.3.1.213701
+  version: 1.3.3.231946
 platform: ruby
 authors:
 - Poliev Alexey
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,230 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: factory_bot_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: faker
-  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: pg
-  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: racc
-  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-collection_matchers
-  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_junit_formatter
-  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
-    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-retry
-  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-set
-  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: shoulda-callback-matchers
-  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: shoulda-matchers
-  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: simplecov
-  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: simplecov-cobertura
-  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: simplecov-console
-  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: tzinfo-data
-  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: webmock
-  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'
 description: Multitenancy for Rails including ActiveRecord, ActionCable, ActiveJob
   and other subsystems
 email:
@@ -387,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Multitenancy for Rails and subsystems