a9n 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 044172d147418c1f64d54e328192b4b9dbb06bd5
-  data.tar.gz: 2b2f7135afc4dc3805a0d14bf405547bfee1c0ec
+  metadata.gz: 6c42b5f9aaf76bc887465a6fdd0a79ee562d9295
+  data.tar.gz: f0451023f9ef4e7868040ed028ca0c7c375a6672
 SHA512:
-  metadata.gz: fb2d5778aa099e48696f1ba15190efcbf643e047aa9f365aee02d0d9ef7d3aedb10b062f192b67829f18043624b86783797dd49c27d128dd2c6a4e86ea5fde5a
-  data.tar.gz: 267caee0c0c17a25d1dfbc9045fda30ce94903a370b672d68af413350c151f8ccbed519d19fdb4bbbc5ee1126f44795d96495e5cc1c63840271ae0755f0e8607
+  metadata.gz: 2b3d29df86f51828f13546861bb0839424a14606d6724798ae7893c43aa06200899693e6267d538f0167d9a062c88776e2721c1363d8879b2eea50e2860b673c
+  data.tar.gz: d972cf3270b4b97f87aae0f7806b4b6c2fbd5f917150c4a80ec8b6686f3eb5a7250f8bf68be1ef0f77189110cc908c2e290f9e77104f1ccca50a5522a3d827c8

data/README.md

@@ -29,7 +29,7 @@ directory. When none fo these files exists, `A9n::MissingConfigurationFile`
 exception is thrown.
 If both file exist, content of `configuration.yml` is validated. It means that
 all keys existing in example file must exist in local file - in case of missing
-keys `A9n::MissingConfigurationVariables` is thrown with the explanation what is missing.
+keys `A9n::MissingConfigurationVariablesError` is thrown with the explanation what is missing.
 
 Set application root and load configuration by adding to your `application.rb` or `environment.rb` right
 after budler requires:

data/a9n.gemspec

@@ -14,4 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "a9n"
   gem.require_paths = ["lib"]
   gem.version       = A9n::VERSION
+
+  gem.required_ruby_version = ">= 2.0"
 end

data/lib/a9n.rb

@@ -9,10 +9,11 @@ require "erb"
 module A9n
   extend SingleForwardable
 
-  class ConfigurationNotLoaded < StandardError; end
-  class MissingConfigurationData < StandardError; end
-  class MissingConfigurationVariables < StandardError; end
-  class NoSuchConfigurationVariable < StandardError; end
+  class ConfigurationNotLoadedError < StandardError; end
+  class MissingConfigurationDataError < StandardError; end
+  class MissingConfigurationVariablesError < StandardError; end
+  class NoSuchConfigurationVariableError < StandardError; end
+  class MissingEnvVariableError < StandardError; end
 
   EXTENSION_LIST = "{yml,yml.erb,yml.example,yml.erb.example}"
 
@@ -49,7 +50,8 @@ module A9n
       defined?(Rails) ? Rails : nil
     end
 
-    def get_env_var(name)
+    def get_env_var(name, strict = false)
+      raise MissingEnvVariableError.new(name) if strict && !ENV.key?(name)
       ENV[name]
     end
 

data/lib/a9n/ext/hash.rb

@@ -19,7 +19,7 @@ module A9n
         if value.is_a?(::Hash)
           deep_prepare(value, scope)
         elsif value.is_a?(Symbol) && value == :env
-          ENV[scope.full_key_name(key).upcase]
+          A9n.get_env_var(scope.env_key_name(key), true)
         else
           value
         end

data/lib/a9n/loader.rb

@@ -22,7 +22,7 @@ module A9n
       example_config  = self.class.load_yml(example_file, scope, env)
 
       if local_config.nil? && example_config.nil?
-        raise A9n::MissingConfigurationData.new("Configuration data for *#{env}* env was not found in neither *#{example_file}* nor *#{local_file}*")
+        raise A9n::MissingConfigurationDataError.new("Configuration data for *#{env}* env was not found in neither *#{example_file}* nor *#{local_file}*")
       end
 
       if !local_config.nil? && !example_config.nil?
@@ -57,7 +57,7 @@ module A9n
     def verify!(local, example)
       missing_keys = example.keys - local.keys
       if missing_keys.any?
-        raise A9n::MissingConfigurationVariables.new("Following variables are missing in #{local_file} file: #{missing_keys.join(",")}")
+        raise A9n::MissingConfigurationVariablesError.new("Following variables are missing in #{local_file} file: #{missing_keys.join(",")}")
       end
     end
   end

data/lib/a9n/scope.rb

@@ -12,8 +12,8 @@ module A9n
       name == MAIN_NAME
     end
 
-    def full_key_name(key)
-      main? ? key : "#{name}_#{key}"
+    def env_key_name(key)
+      (main? ? key : "#{name}_#{key}").upcase
     end
 
     def self.form_file_path(path)

data/lib/a9n/struct.rb

@@ -13,7 +13,7 @@ module A9n
     end
 
     def method_missing(name, *args)
-      raise NoSuchConfigurationVariable.new(name)
+      raise NoSuchConfigurationVariableError.new(name)
     end
   end
 end

data/lib/a9n/version.rb

@@ -1,3 +1,3 @@
 module A9n
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/spec/integration/a9n_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe A9n do
 
   before do
     clean_singleton(subject)
+    ENV["ERB_DWARF"] = "erbized dwarf"
+    ENV["DWARF_PASSWORD"] = "dwarf123"
     ENV["MANDRILL_API_KEY"] = "ASDF1234"
     ENV["API_KEY"] = "XYZ999"
     subject.app = double(env: env)
@@ -34,7 +36,7 @@ RSpec.describe A9n do
     end
 
     it do
-      expect { subject.invalid }.to raise_error(A9n::NoSuchConfigurationVariable)
+      expect { subject.invalid }.to raise_error(A9n::NoSuchConfigurationVariableError)
     end
 
     it do

data/spec/unit/a9n_spec.rb

@@ -228,7 +228,7 @@ RSpec.describe A9n do
 
       it do
         expect(subject.storage).to be_empty
-        expect { subject.whatever }.to raise_error(A9n::NoSuchConfigurationVariable)
+        expect { subject.whatever }.to raise_error(A9n::NoSuchConfigurationVariableError)
       end
     end
 
@@ -239,7 +239,7 @@ RSpec.describe A9n do
       end
 
       it do
-        expect { subject.whatever }.to raise_error(A9n::NoSuchConfigurationVariable)
+        expect { subject.whatever }.to raise_error(A9n::NoSuchConfigurationVariableError)
       end
     end
   end

data/spec/unit/loader_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe A9n::Loader do
       it "raises expection"  do
         expect {
           subject.load
-        }.to raise_error(A9n::MissingConfigurationData)
+        }.to raise_error(A9n::MissingConfigurationDataError)
       end
     end
 
@@ -48,7 +48,7 @@ RSpec.describe A9n::Loader do
       it { expect(config.api_key).to eq("example1234") }
 
       it do
-        expect { config.app_host }.to raise_error(A9n::NoSuchConfigurationVariable)
+        expect { config.app_host }.to raise_error(A9n::NoSuchConfigurationVariableError)
       end
     end
 
@@ -63,7 +63,7 @@ RSpec.describe A9n::Loader do
       it { expect(config.api_key).to eq("local1234") }
 
       it do
-        expect { config.app_url }.to raise_error(A9n::NoSuchConfigurationVariable)
+        expect { config.app_url }.to raise_error(A9n::NoSuchConfigurationVariableError)
       end
     end
 
@@ -79,7 +79,7 @@ RSpec.describe A9n::Loader do
         it { expect(config.api_key).to eq("example1234") }
 
         it do
-          expect { config.app_host }.to raise_error(A9n::NoSuchConfigurationVariable)
+          expect { config.app_host }.to raise_error(A9n::NoSuchConfigurationVariableError)
         end
       end
 
@@ -94,7 +94,7 @@ RSpec.describe A9n::Loader do
         it "raises expection with missing variables names"  do
           expect {
             subject.load
-          }.to raise_error(A9n::MissingConfigurationVariables, /#{missing_variables_names.join(", ")}/)
+          }.to raise_error(A9n::MissingConfigurationVariablesError, /#{missing_variables_names.join(", ")}/)
         end
       end
     end
@@ -124,8 +124,8 @@ RSpec.describe A9n::Loader do
       end
 
       after do
-        ENV["ERB_DWARF"] = nil
-        ENV["DWARF_PASSWORD"] = nil
+        ENV.delete("ERB_DWARF")
+        ENV.delete("DWARF_PASSWORD")
       end
 
       context "when file has erb extension" do
@@ -155,9 +155,18 @@ RSpec.describe A9n::Loader do
         end
 
         it "gets valus from ENV" do
-          p subject
           expect(subject[:dwarf_password]).to eq("dwarf123")
         end
+
+        it "raises exception when ENV var is not set" do
+          ENV.delete("DWARF_PASSWORD")
+          expect{ subject[:dwarf_password] }.to raise_error(A9n::MissingEnvVariableError)
+        end
+
+        it "raises exception when ENV var is set to nil" do
+          ENV["DWARF_PASSWORD"] = nil
+          expect{ subject[:dwarf_password] }.to raise_error(A9n::MissingEnvVariableError)
+        end
       end
 
       context "having no env and only defaults data" do

data/spec/unit/struct_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe A9n::Struct do
     it "raises error on accessin invalid attribute" do
       expect {
         subject.dwarf
-      }.to raise_error(A9n::NoSuchConfigurationVariable, "dwarf")
+      }.to raise_error(A9n::NoSuchConfigurationVariableError, "dwarf")
     end
   end
 
@@ -106,7 +106,7 @@ RSpec.describe A9n::Struct do
     it "raises exception when value not exists" do
       expect {
         subject.non_existing_dwarf
-      }.to raise_error(A9n::NoSuchConfigurationVariable)
+      }.to raise_error(A9n::NoSuchConfigurationVariableError)
     end
 
     describe "#[]" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a9n
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies: []
 description: a9n - ruby/rails apps configuration manager
 email:
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="