conf_loader 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0faf9108d7e238f50b273199aaffa4170995a137
-  data.tar.gz: 19433f3f3b1595f0f1f1ed2f1c05bb8b381ff9de
+SHA256:
+  metadata.gz: c82b9ec01e8a0a4b07b9714a1eaa35f4043c17e08b0c2ccce45df79ab8c3750e
+  data.tar.gz: e8a6aad65c5d641d972aac4b61921f96e65e2823b1e266c45bb6eaebe9bde363
 SHA512:
-  metadata.gz: 8598f2926e6902f67cf6b9e4332cb1d90d7246dea1d64ed81257290223473cc25af0128314b846322f80b379016b06b752760bd5656936e5a37d8ac0e0edc50c
-  data.tar.gz: 9f2b2b29c155fd56514fdb7a113794f6cd60e3d3f37501439fdbb5e55a042b2fe793018cc1e33091d9478a42e4ba146c2003cda97d16ec7ef15541c1fcd46220
+  metadata.gz: fb93f7a857e5d261942b4a4ff4faf32098ba02788fe2c4533bbab8b581c4a2202c6334fea4fff2e1be41b8f21d409786afe5e518304fd07203a5abded5e51c2c
+  data.tar.gz: add4a26b151f6b080cd282598c2181361636b69fc26eff5770641a16941ded9b4645d43c74952fbaa8513323ca26625c942aeba43e998e697e450c5269967453

data/.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+name: Publish Gem
+
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+
+      - name: Release Gem
+        uses: discourse/publish-rubygems-action@b55d7b91b55e61752dc6cbc2972f8e16fe6c1a02
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.7.2

data/lib/conf_loader/version.rb

@@ -1,3 +1,3 @@
 class ConfLoader
-  VERSION = '2.0.0'
+  VERSION = '2.2.0'
 end

data/lib/conf_loader.rb

@@ -21,7 +21,9 @@ class ConfLoader
   # @api public
   def self.load(path, env)
     template = ERB.new File.new(path).read
-    environments = YAML.load template.result(binding)
+    source = template.result(binding)
+
+    environments = load_environments(source)
 
     if environments.has_key?(env)
       hash = environments[env]
@@ -38,6 +40,16 @@ class ConfLoader
 
   private_class_method
 
+  if Gem::Version.new(RUBY_VERSION).release >= Gem::Version.new('3.1.0')
+    def self.load_environments(source)
+      YAML.load(source, aliases: true)
+    end
+  else
+    def self.load_environments(source)
+      YAML.load(source)
+    end
+  end
+
   def self.guarantee_key_presence(hash)
     hash.default_proc = proc do |h, k|
       raise KeyError, "#{k} not defined"
@@ -46,11 +58,11 @@ class ConfLoader
   end
 
   def self.check_value_presence(hash)
-    errors = check_values_not_empty(hash)
-    if errors.empty?
+    error_keys = check_values_not_empty(hash)
+    if error_keys.empty?
       hash
     else
-      raise ValueNotDefinedError, errors.join(', ')
+      raise ValueNotDefinedError, "Undefined keys: #{error_keys.join(', ')}"
     end
   end
 
@@ -58,9 +70,9 @@ class ConfLoader
     hash.inject([]) do |acc, (key, value)|
       errors =
         if value.is_a?(Hash)
-          check_values_not_empty(value)
+          check_values_not_empty(value).map { |child_key| "#{key}.#{child_key}" }
         elsif value.to_s.empty?
-          ["#{key} value not defined"]
+          [key]
         else
           []
         end

data/spec/fixtures/simple.yml

@@ -15,3 +15,5 @@ invalid:
   empty_value: ''
   nested_field:
     nested_empty_value: ''
+    nested_empty_value2: ''
+    nested_non_empty_value: 'non-empty'

data/spec/integration/conf_loader_spec.rb

@@ -64,7 +64,7 @@ describe ConfLoader do
     it 'raises ValueNotDefinedError' do
       expect{conf}.to raise_error(
         described_class::ValueNotDefinedError,
-        'empty_value value not defined, nested_empty_value value not defined'
+        'Undefined keys: empty_value, nested_field.nested_empty_value, nested_field.nested_empty_value2'
       )
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conf_loader
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Indrek Juhkam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symbolizer
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
@@ -65,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Helps to load conf files in SaleMove ecosystem