elasticonf 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53660c491b6cb9f052da798d870ed9fba66873bd
-  data.tar.gz: e23890b87312c7a42d744b9a5971a47f38f2a17b
+  metadata.gz: cd115068bd4e3aa9f3335c5728f744684d88231e
+  data.tar.gz: ef56ca9fa15a060e729d983b7ca3fe93f5460287
 SHA512:
-  metadata.gz: 72d9b370cfbb6e2b8b676bf7d2725aa3e7acaebd869ad21faa50f77aef35205169123303625d0e2bcd91dfc2701e4e3f72cbd22960b8bab1edea0fa30cf776b9
-  data.tar.gz: 65cb6a62d043b0e480938ef2216f11da2530683d6b16e39c7e4bfc6f29586498053dfa3334bfe0666737fc6a00cba00a6aa2f41e412654cf04d59fd749b7ba31
+  metadata.gz: 83d0d17bd2506b22ffe0f5fdf13d19e9d2bc6cb43646e2cdaf2d858af473699a2758f80a9bf5e548588943eaf35ee6ae41fc4c87930091ba51859188365826bc
+  data.tar.gz: b7130ff9b5b389af6cd54570e2dd895b549ab209ef18e3633cad593daf796df22b482eb0bb4f68454e877fbb5a8e94270e5fe0fbfc21e53f627acc2cd45e9914

data/.gitignore

@@ -2,4 +2,5 @@
 .yardoc
 doc
 pkg
-vendor/bundle
+vendor/bundle
+coverage/

data/.travis.yml

@@ -2,17 +2,20 @@ language: ruby
 
 rvm:
   - ruby-head
+  - jruby-head
+  - rbx-head
   - 2.1.1
   - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2
-  - jruby-19mode
-  - jruby-head
-  - rbx-2.1
-  - rbx-2.2
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: jruby-head
+    - rvm: rbx-head
+
+branches:
+  only:
+    - master

data/Gemfile

@@ -1,2 +1,7 @@
 source 'https://rubygems.org'
-gemspec
+
+gemspec
+
+group :test do
+  gem 'coveralls', require: false
+end

data/Gemfile.lock

@@ -1,15 +1,26 @@
 PATH
   remote: .
   specs:
-    elasticonf (1.0.0)
-      hashie (~> 2.1.0)
+    elasticonf (1.1.0)
+      hashie (~> 3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     diff-lcs (1.2.5)
-    hashie (2.1.1)
-    rake (10.3.1)
+    docile (1.1.5)
+    hashie (3.1.0)
+    mime-types (2.3)
+    multi_json (1.10.1)
+    rake (10.3.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -18,13 +29,23 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.3.0)
     yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   elasticonf!
-  rake (~> 10.3.0)
-  rspec (~> 2.14.0)
-  yard (~> 0.8.0)
+  rake (~> 10.3)
+  rspec (~> 2.14)
+  yard (~> 0.8)

data/README.md

@@ -1,4 +1,4 @@
-ElastiConf [![Build Status](https://travis-ci.org/rezwyi/elasticonf.svg?branch=master)](https://travis-ci.org/rezwyi/elasticonf) [![Dependency Status](https://gemnasium.com/rezwyi/elasticonf.svg)](https://gemnasium.com/rezwyi/elasticonf)
+ElastiConf [![Build Status](https://travis-ci.org/rezwyi/elasticonf.svg?branch=master)](https://travis-ci.org/rezwyi/elasticonf) [![Dependency Status](https://gemnasium.com/rezwyi/elasticonf.svg)](https://gemnasium.com/rezwyi/elasticonf) [![Coverage Status](https://img.shields.io/coveralls/rezwyi/elasticonf.svg)](https://coveralls.io/r/rezwyi/elasticonf)
 ==========
 
 Powerfull and flexible application config solution worked in any ruby program. No clases definition, no dependencies. It just works!
@@ -8,7 +8,7 @@ Powerfull and flexible application config solution worked in any ruby program. N
 First add the following lines to your application `Gemfile`:
 
 ``` ruby
-gem 'elasticonf', '~> 1.0.0.beta'
+gem 'elasticonf', '~> 1.1.0'
 ```
 
 Then run `bundle install` to update your's gems bundle.
@@ -28,7 +28,8 @@ Run this commands in terminal:
 0. `cd some/path`
 0. `git clone git@github.com:rezwyi/elasticonf.git`
 0. `cd elasticonf/`
-0. `bin/rspec`
+0. `bundle install`
+0. `bin/rake`
 
 ## Versioning
 

data/elasticonf.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_dependency 'hashie', '~> 2.1.0'
+  s.add_dependency 'hashie', '~> 3.1'
 
-  s.add_development_dependency 'rake', '~> 10.3.0'
-  s.add_development_dependency 'rspec', '~> 2.14.0'
-  s.add_development_dependency 'yard', '~> 0.8.0'
-end
+  s.add_development_dependency 'rake', '~> 10.3'
+  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'yard', '~> 0.8'
+end

data/lib/elasticonf/config.rb

@@ -1,11 +1,8 @@
 module ElastiConf
-  module Config
-    def configure
-      yield self
-    end
-
+  class Config
     def reset_config!
       %w(
+        env
         config_root
         config_file
         const_name
@@ -14,16 +11,27 @@ module ElastiConf
         instance_variable_set "@#{v}", nil
       end
     end
+    
+    def env
+      @env ||= 'development'
+    end
+
+    def env=(value)
+      unless [String, Symbol].include?(value.class)
+        raise ArgumentError, "String or Symbol expected #{value.class} given"
+      end
+      @env = value.to_s
+    end
 
     def config_root
-      @config_root ||= raise(ArgumentError, 'You must first specify config root')
+      @config_root ||= raise(ArgumentError, 'You must specify config_root option first')
     end
 
     def config_root=(value)
       unless [String, Symbol, Pathname].include?(value.class)
-        raise ArgumentError, "String or Pathname expected #{value.class} given"
+        raise ArgumentError, "String or Symbol or Pathname expected #{value.class} given"
       end
-      @config_root = value.is_a?(String) ? Pathname.new(value.to_s) : value
+      @config_root = value.is_a?(Pathname) ? value : Pathname.new(value.to_s)
     end
 
     def config_file
@@ -34,7 +42,7 @@ module ElastiConf
       unless [String, Symbol].include?(value.class)
         raise ArgumentError, "String or Symbol expected #{value.class} given"
       end
-      @config_file = value
+      @config_file = value.to_s
     end
 
     def const_name

data/lib/elasticonf/loader.rb

@@ -1,4 +1,17 @@
 module ElastiConf
   class Loader < Hashie::Mash
+    def get(key)
+      unless [String, Symbol].include?(key.class)
+        raise ArgumentError, "String or Symbol expected #{key.class} given"
+      end
+      
+      hash, items = self, key.split('.')
+      
+      while (item = items.shift)
+        (hash = hash[item.to_sym]) || break
+      end
+
+      hash
+    end
   end
 end

data/lib/elasticonf/version.rb

@@ -1,3 +1,3 @@
 module ElastiConf
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/elasticonf.rb

@@ -6,35 +6,51 @@ require 'elasticonf/config'
 require 'elasticonf/loader'
 
 module ElastiConf
-  extend Config
-
   module_function
 
   def root
     @root ||= Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
   end
 
+  def config
+    @config ||= Config.new
+  end
+
+  def configure
+    yield config
+  end
+
   def load!(env = nil)
-  	const_name = ElastiConf.const_name
-  	config_file = ElastiConf.config_root.join(ElastiConf.config_file + '.yml')
-    
-    env_config_file = env ?
-      ElastiConf.config_root.join(ElastiConf.config_file, "#{env}.yml") :
-      nil
-    
-    raise("Config file #{config_file} not found. Cannot continue") unless File.exists?(config_file)
+  	config_file = config.config_root.join(config.config_file + '.yml')
+    config.env = env if env
+
+    unless File.exists?(config_file)
+      raise "Config file #{config_file} not found. Cannot continue"
+    end
+
+    loader = Loader[YAML.load_file(config_file)]
     
-    config = Loader[YAML.load_file(config_file)]
-    if env_config_file && File.exists?(env_config_file)
-      config = config.deep_merge(Loader[YAML.load_file(env_config_file)])
+    env_config_file = config.config_root.join(config.config_file, "#{config.env}.yml")
+    if File.exists?(env_config_file)
+      loader = loader.deep_merge(Loader[YAML.load_file(env_config_file)])
+    end
+
+    local_config_file = config.config_root.join(config.config_file + '.local.yml')
+    if File.exists?(local_config_file)
+      loader = loader.deep_merge(Loader[YAML.load_file(local_config_file)])
     end
     
-    if Kernel.const_defined?(const_name)
-      raise_if_already_initialized_constant ?
-        raise("Cannot set constant #{const_name} because it is already initialized") :
-        Kernel.send(:remove_const, const_name)
+    if Kernel.const_defined?(config.const_name)
+      config.raise_if_already_initialized_constant ?
+        raise("Cannot set constant #{config.const_name} because it is already initialized") :
+        Kernel.send(:remove_const, config.const_name)
     end
     
-    Kernel.const_set const_name, config
+    Kernel.const_set config.const_name, loader
+  end
+
+  def configure_and_load!
+    configure { |config| yield(config) }
+    load!
   end
 end

data/spec/lib/elasticonf/config_spec.rb

@@ -1,7 +1,167 @@
 require 'spec_helper'
 
 describe ElastiConf::Config do
-  it 'should be a module' do
-    subject.should be_a(Module)
+  describe '#reset_config!' do
+    before do
+      subject.env = :test
+      subject.config_root = '/configuration'
+      subject.config_file = 'application'
+      subject.const_name = 'AppSettings'
+      subject.raise_if_already_initialized_constant = false
+      
+      subject.reset_config!
+    end
+    
+    its(:env) { should eql('development') }
+    its(:config_file) { should eql('config') }
+    its(:const_name) { should eql('Settings') }
+    its(:raise_if_already_initialized_constant) { should be_true }
+
+    it 'should raise an error' do
+      expect { subject.config_root }.to raise_error
+    end
+  end
+
+  describe '#env' do
+    its(:env) { should eql('development') }
+
+    it 'should return some value' do
+      expect { subject.env = :test }.to change(subject, :env).to('test')
+    end
+
+    context 'when wrong argument given' do
+      it 'should raise an error' do
+        expect { subject.env = -> {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.env = {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.env = [] }.to raise_error
+      end
+    end
+  end
+
+  describe '#config_root' do
+    it 'should raise an error' do
+      expect { subject.config_root }.to raise_error
+    end
+
+    it 'should return some value' do
+      subject.config_root = '/config'
+      expect(subject.config_root).to eql(Pathname.new('/config'))
+    end
+
+    context 'when wrong argument given' do
+      it 'should raise an error' do
+        expect { subject.config_root = -> {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.config_root = {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.config_root = [] }.to raise_error
+      end
+    end
+  end
+
+  describe '#config_file' do
+    its(:config_file) { should eql('config') }
+
+    it 'should return some value' do
+      expect {
+        subject.config_file = 'application'
+      }.to change(subject, :config_file).to('application')
+    end
+
+    context 'when wrong argument given' do
+      it 'should raise an error' do
+        expect { subject.config_file = -> {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.config_file = {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.config_file = [] }.to raise_error
+      end
+    end
+  end
+
+  describe '#const_name' do
+    its(:const_name) { should eql('Settings') }
+
+    it 'should return some value' do
+      expect {
+        subject.const_name = 'AppSettings'
+      }.to change(subject, :const_name).to('AppSettings')
+    end
+
+    it 'should return some value' do
+      expect {
+        subject.const_name = :'AppSettings'
+      }.to change(subject, :const_name).to('AppSettings')
+    end
+
+    context 'when wrong argument given' do
+      it 'should raise an error' do
+        expect { subject.const_name = -> {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.const_name = {} }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.const_name = [] }.to raise_error
+      end
+    end
+  end
+
+  describe '#raise_if_already_initialized_constant' do
+    its(:raise_if_already_initialized_constant) { should be_true }
+
+    it 'should change to false' do
+      expect {
+        subject.raise_if_already_initialized_constant = false
+      }.to change(subject, :raise_if_already_initialized_constant).to(false)
+    end
+
+    context 'when wrong argument given' do
+      it 'should raise an error' do
+        expect {
+          subject.raise_if_already_initialized_constant = 'some_string'
+        }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect {
+          subject.raise_if_already_initialized_constant = :some_symbol
+        }.to raise_error
+      end
+      
+      it 'should raise an error' do
+        expect {
+          subject.raise_if_already_initialized_constant = -> {}
+        }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect {
+          subject.raise_if_already_initialized_constant = {}
+        }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect {
+          subject.raise_if_already_initialized_constant = []
+        }.to raise_error
+      end
+    end
   end
 end

data/spec/lib/elasticonf/loader_spec.rb

@@ -1,7 +1,44 @@
 require 'spec_helper'
 
 describe ElastiConf::Loader do
+  subject do
+    file = ElastiConf.root.join('spec', 'fixtures', 'config.yml')
+    described_class[YAML.load_file(file)]
+  end
+  
   it 'should be inherited from Hashie::Mash' do
     subject.should be_kind_of(Hashie::Mash)
   end
+
+  describe '#get' do
+    it 'should return nil' do
+      expect(subject.get('some.unexisting.key')).to be_nil
+    end
+    
+    it 'should return some value' do
+      expect(subject.get('some_config.int_key')).to eql(1)
+    end
+
+    it 'should return some value' do
+      expect(subject.get('some_config.str_key')).to eql('1')
+    end
+
+    context 'when wrong argument given' do
+      it 'should raise an error' do
+        expect { subject.get }.to raise_error
+      end
+      
+      it 'should raise an error' do
+        expect { subject.get({}) }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.get([]) }.to raise_error
+      end
+
+      it 'should raise an error' do
+        expect { subject.get(false) }.to raise_error
+      end
+    end
+  end
 end

data/spec/lib/elasticonf_spec.rb

@@ -3,6 +3,18 @@ require 'spec_helper'
 describe ElastiConf do
   it { should be_a(Module) }
 
+  describe '#root' do
+    its(:root) do
+      should eql(Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))))
+    end
+  end
+
+  describe '#config' do
+    it 'should instantiate ElastiConf::Config' do
+      expect(subject.config.class).to eql(ElastiConf::Config)
+    end
+  end
+
   describe '#configure' do
     before do
       subject.configure do |config|
@@ -13,155 +25,27 @@ describe ElastiConf do
       end
     end
 
-    its(:config_root) { should eql(Pathname('/config')) }
-    its(:config_file) { should eql('application') }
-    its(:const_name) { should eql('AppSettings') }
-    its(:raise_if_already_initialized_constant) { should be_false }
-  end
-
-  describe '#reset_config!' do
-    before { subject.reset_config! }
-
-    its(:config_file) { should eql('config') }
-    its(:const_name) { should eql('Settings') }
-    its(:raise_if_already_initialized_constant) { should be_true }
-
-    it 'should raise an error' do
-      expect { subject.config_root }.to raise_error
+    it 'should return config_root' do
+      expect(subject.config.config_root).to eql(Pathname('/config'))
     end
-  end
 
-  describe '#config_root' do
-    it 'should raise an error' do
-      expect { subject.config_root }.to raise_error
+    it 'should return config_file' do
+      expect(subject.config.config_file).to eql('application')
     end
 
-    it 'should return some value' do
-      subject.config_root = '/config'
-      subject.config_root.should eql(Pathname.new('/config'))
+    it 'should return const_name' do
+      expect(subject.config.const_name).to eql('AppSettings')
     end
 
-    context 'when wrong argument given' do
-      it 'should raise an error' do
-        expect { subject.config_root = -> {} }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect { subject.config_root = {} }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect { subject.config_root = [] }.to raise_error
-      end
-    end
-  end
-
-  describe '#config_file' do
-    its(:config_file) { should eql('config') }
-
-    it 'should return some value' do
-      expect {
-        subject.config_file = 'application'
-      }.to change(subject, :config_file).to('application')
-    end
-
-    context 'when wrong argument given' do
-      it 'should raise an error' do
-        expect { subject.config_file = -> {} }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect { subject.config_file = {} }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect { subject.config_file = [] }.to raise_error
-      end
-    end
-  end
-
-  describe '#const_name' do
-    its(:const_name) { should eql('Settings') }
-
-    it 'should return some value' do
-      expect {
-        subject.const_name = 'AppSettings'
-      }.to change(subject, :const_name).to('AppSettings')
-    end
-
-    it 'should return some value' do
-      expect {
-        subject.const_name = :'AppSettings'
-      }.to change(subject, :const_name).to('AppSettings')
-    end
-
-    context 'when wrong argument given' do
-      it 'should raise an error' do
-        expect { subject.const_name = -> {} }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect { subject.const_name = {} }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect { subject.const_name = [] }.to raise_error
-      end
-    end
-  end
-
-  describe '#raise_if_already_initialized_constant' do
-    its(:raise_if_already_initialized_constant) { should be_true }
-
-    it 'should change to false' do
-      expect {
-        subject.raise_if_already_initialized_constant = false
-      }.to change(subject, :raise_if_already_initialized_constant).to(false)
-    end
-
-    context 'when wrong argument given' do
-      it 'should raise an error' do
-        expect {
-          subject.raise_if_already_initialized_constant = 'some_string'
-        }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect {
-          subject.raise_if_already_initialized_constant = :some_symbol
-        }.to raise_error
-      end
-      
-      it 'should raise an error' do
-        expect {
-          subject.raise_if_already_initialized_constant = -> {}
-        }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect {
-          subject.raise_if_already_initialized_constant = {}
-        }.to raise_error
-      end
-
-      it 'should raise an error' do
-        expect {
-          subject.raise_if_already_initialized_constant = []
-        }.to raise_error
-      end
-    end
-  end
-
-  describe '#root' do
-    its(:root) do
-      should eql(Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))))
+    it 'should return false' do
+      expect(subject.config.raise_if_already_initialized_constant).to eql(false)
     end
   end
 
   describe '#load!' do
     before do
       subject.configure do |config|
-        config.config_root = ElastiConf.root.join('spec', 'fixtures')
+        config.config_root = subject.root.join('spec', 'fixtures')
         config.config_file = 'application'
         config.const_name = const_name
       end
@@ -187,7 +71,7 @@ describe ElastiConf do
       expect(AppSettings.some_config.str_key).to eql('1')
     end
 
-    context 'when some env given' do
+    context 'when some env given (as argument)' do
       let(:env) { :test }
       
       it 'should not raise an error' do
@@ -205,6 +89,24 @@ describe ElastiConf do
       end
     end
 
+    context 'and some env given (through config.env)' do
+      before { subject.config.env = :test }
+
+      it 'should not raise an error' do
+        expect { subject.load! }.not_to raise_error
+      end
+
+      it 'should load missing values from config file' do
+        subject.load!
+        expect(AppSettings.some_config.int_key).to eql(2)
+      end
+
+      it 'should override values from config file' do
+        subject.load!
+        expect(AppSettings.some_config.str_key).to eql('2')
+      end
+    end
+
     context 'when already initialized constant' do
       before { Kernel.const_set(const_name, {}) }
       
@@ -213,9 +115,95 @@ describe ElastiConf do
       end
 
       it 'should not raise an error' do
-        subject.raise_if_already_initialized_constant = false
+        subject.config.raise_if_already_initialized_constant = false
+        expect { subject.load! }.not_to raise_error
+      end
+    end
+
+    context 'when .local file present' do
+      let(:config_file) { subject.config.config_root.join('application.yml') }
+      let(:local_config_file) { subject.config.config_root.join('application.local.yml') }
+      
+      before do
+        YAML::load_file(config_file).tap do |config|
+          config['some_config']['str_key'] = 'local'
+          config['some_config'].delete('int_key')
+          File.open(local_config_file, 'w') { |f| f.write config.to_yaml }
+        end
+      end
+
+      after { FileUtils.rm(local_config_file) }
+
+      it 'should not raise an error' do
         expect { subject.load! }.not_to raise_error
       end
+
+      it 'should load missing values from config file' do
+        subject.load!
+        expect(AppSettings.some_config.int_key).to eql(1)
+      end
+      
+      it 'should override values from config file' do
+        subject.load!
+        expect(AppSettings.some_config.str_key).to eql('local')
+      end
+
+      context 'and some env given (as argument)' do
+        let(:env) { :test }
+
+        it 'should not raise an error' do
+          expect { subject.load!(env) }.not_to raise_error
+        end
+
+        it 'should load missing values from config file' do
+          subject.load! env
+          expect(AppSettings.some_config.int_key).to eql(2)
+        end
+
+        it 'should override values from config file' do
+          subject.load! env
+          expect(AppSettings.some_config.str_key).to eql('local')
+        end
+      end
+
+      context 'and some env given (through config.env)' do
+        before { subject.config.env = :test }
+
+        it 'should not raise an error' do
+          expect { subject.load! }.not_to raise_error
+        end
+
+        it 'should load missing values from config file' do
+          subject.load!
+          expect(AppSettings.some_config.int_key).to eql(2)
+        end
+
+        it 'should override values from config file' do
+          subject.load!
+          expect(AppSettings.some_config.str_key).to eql('local')
+        end
+      end
+    end
+  end
+
+  describe '#configure_and_load!' do
+    before { ElastiConf.stub(:load!).and_return(true) }
+    
+    let(:config_block) do
+      Proc.new do |config|
+        config.config_root = subject.root.join('spec', 'fixtures')
+        config.raise_if_already_initialized_constant = false
+      end
+    end
+    
+    it 'should call configure' do
+      subject.should_receive :configure
+      subject.configure_and_load! &config_block
+    end
+
+    it 'should call load' do
+      subject.should_receive :load!
+      subject.configure_and_load! &config_block
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,13 +3,15 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'bundler'
 Bundler.require :default
 
+require 'coveralls'
+Coveralls.wear!
+
 require 'elasticonf'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
 
   # After each test spec rollback configuration to its default state
-  config.after(:each) { ElastiConf.reset_config! }
+  config.after(:each) { ElastiConf.config.reset_config! }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticonf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sergey Rezvanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
 description: Powerfull and flexible application config solution worked in any ruby
   program
 email: