conf_loader 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2064ef2962ea950a910ed91b16ed6eeb56d7d7fe
-  data.tar.gz: fd311e0300ab0ffda09ac077a55bcf34943e36da
+  metadata.gz: 0faf9108d7e238f50b273199aaffa4170995a137
+  data.tar.gz: 19433f3f3b1595f0f1f1ed2f1c05bb8b381ff9de
 SHA512:
-  metadata.gz: 2779d36c5c7e8cd49520eaf8e45e7bd31f78d61611c52588ddf0918d9e57f0b3837da8c4d83c7108f721866da93331a4d404d75d2e3d22e9b430044a6cd3db68
-  data.tar.gz: 755c887c78d21691415198cf8a6a6f81f0200dd4f45b33d4a4b7e92d62231eae1d5189f3a064ba7009c83e49ec188d666207b67d253ed31741e1a4d93435c528
+  metadata.gz: 8598f2926e6902f67cf6b9e4332cb1d90d7246dea1d64ed81257290223473cc25af0128314b846322f80b379016b06b752760bd5656936e5a37d8ac0e0edc50c
+  data.tar.gz: 9f2b2b29c155fd56514fdb7a113794f6cd60e3d3f37501439fdbb5e55a042b2fe793018cc1e33091d9478a42e4ba146c2003cda97d16ec7ef15541c1fcd46220

data/lib/conf_loader/version.rb

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

data/lib/conf_loader.rb

@@ -6,6 +6,7 @@ require 'erb'
 #
 class ConfLoader
   EnvironmentNotFoundError = Class.new(KeyError)
+  ValueNotDefinedError = Class.new(KeyError)
 
   # Load given conf file
   #
@@ -24,13 +25,19 @@ class ConfLoader
 
     if environments.has_key?(env)
       hash = environments[env]
-      guarantee_key_presence(Symbolizer.symbolize(hash))
+
+      check_value_presence(
+        guarantee_key_presence(Symbolizer.symbolize(hash))
+      )
     else
       raise EnvironmentNotFoundError,
         "Configuration for `#{env}` not found at path #{path}"
     end
   end
 
+
+  private_class_method
+
   def self.guarantee_key_presence(hash)
     hash.default_proc = proc do |h, k|
       raise KeyError, "#{k} not defined"
@@ -38,5 +45,26 @@ class ConfLoader
     hash
   end
 
-  private_class_method :guarantee_key_presence
+  def self.check_value_presence(hash)
+    errors = check_values_not_empty(hash)
+    if errors.empty?
+      hash
+    else
+      raise ValueNotDefinedError, errors.join(', ')
+    end
+  end
+
+  def self.check_values_not_empty(hash)
+    hash.inject([]) do |acc, (key, value)|
+      errors =
+        if value.is_a?(Hash)
+          check_values_not_empty(value)
+        elsif value.to_s.empty?
+          ["#{key} value not defined"]
+        else
+          []
+        end
+      acc + errors
+    end
+  end
 end

data/spec/fixtures/simple.yml

@@ -9,4 +9,9 @@ production:
 flexible:
   foo: <%= ENV['FOO'] %>
   var_with_default_not_in_env: <%= ENV['SOME_VAR_NOT_IN_ENV'] || 'default_value' %>
-  var_with_default_in_env: <%= ENV['FOO'] || 'default_value' %>
+  var_with_default_in_env: <%= ENV['FOO'] || 'default_value' %>
+
+invalid:
+  empty_value: ''
+  nested_field:
+    nested_empty_value: ''

data/spec/integration/conf_loader_spec.rb

@@ -58,4 +58,14 @@ describe ConfLoader do
     end
   end
 
+  context 'with empty config value' do
+    let(:conf) { described_class.load(path, 'invalid') }
+
+    it 'raises ValueNotDefinedError' do
+      expect{conf}.to raise_error(
+        described_class::ValueNotDefinedError,
+        'empty_value value not defined, nested_empty_value value not defined'
+      )
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conf_loader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Indrek Juhkam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symbolizer
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Helps to load conf files in SaleMove ecosystem