a9n 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e369363c79fb9a656521140c1579f784a7e9dc4a
-  data.tar.gz: cfc947874a96b1884b65200baf180c7f85b5c30d
+  metadata.gz: 39c493dd369e2ff7e7ca0fbc67aeb3eb3d2bb4de
+  data.tar.gz: 3d15911fbfc65a606fc3f5484b99ca9549fd76fb
 SHA512:
-  metadata.gz: 87fe223271b1188c7df2322279456879bf47a6abfb5c97b9d7ca95faf81d13a9fdae9bce28d2fa6df47ad86f5a361660ccc55153ed4904f7bd099408bc819093
-  data.tar.gz: 4c452ad39305bc59df2c81ab207ee98424e8a80967055caebc6fc035b88432f510a49caaa7621053be67ea62faa40859be50cedf8bdeb48a7d5fce11ac31e1c9
+  metadata.gz: d8dfd10661f36985ebbe762c773e329fa4aedcf74fe5c30da08d201e510198d9f8b81e66e4290657e1fb2c4e94c9661c9ae6a3f34854feda9cea581d2168588b
+  data.tar.gz: 31d6d95ae6553c7a62b332af9e40fef465395da7b6637452bfaa7a7317a4030ba4ba5c3db44128e465a17942b8469b3ca305a6cb00423834f3df69f8e14591fa

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0@a9n

data/.travis.yml

@@ -4,5 +4,3 @@ rvm:
   - 2.0.0
   - 2.1.1
   - jruby-19mode
-  - rbx-2.0.0
-  - rbx-2.1.1

data/lib/a9n.rb

@@ -6,7 +6,6 @@ require "erb"
 
 module A9n
   class ConfigurationNotLoaded < StandardError; end
-  class MissingConfigurationFile < StandardError; end
   class MissingConfigurationData < StandardError; end
   class MissingConfigurationVariables < StandardError; end
   class NoSuchConfigurationVariable < StandardError; end
@@ -47,46 +46,39 @@ module A9n
     def load(*files)
       files = [DEFAULT_FILE] if files.empty?
       files.map do |file|
-        env_config     = load_env_config(file)
-        default_config = load_default_config(file)
+        default_and_env_config = load_config(file)
 
-        whole_config   = default_config.merge(env_config)
-
-        instance_variable_set(var_name_for(file), A9n::Struct.new(whole_config))
+        instance_variable_set(var_name_for(file), A9n::Struct.new(default_and_env_config))
       end
     end
 
-    def load_env_config(file)
-      base     = load_yml("config/#{file}.example", env)
-      local    = load_yml("config/#{file}", env)
+    def load_config(file)
+      env_example      = load_yml("config/#{file}.example", env)
+      env_local        = load_yml("config/#{file}", env)
+      default_example  = load_yml("config/#{file}.example", "defaults")
+      default_local    = load_yml("config/#{file}", "defaults")
 
-      if base.nil? && local.nil?
-        raise MissingConfigurationFile.new("Neither config/#{file}.example nor config/#{file} was found")
+      if env_example.nil? && env_local.nil? && default_example.nil? && default_local.nil?
+        raise MissingConfigurationData.new("Configuration data was not found in neither config/#{file}.example nor config/#{file}")
       end
 
-      if !base.nil? && !local.nil?
-        verify!(base, local)
-      end
+      example = Hash.merge(default_example, env_example)
+      local = Hash.merge( default_local,env_local)
 
-      local || base
-    end
+      if !example.nil? && !local.nil?
+        verify!(example, local)
+      end
 
-    def load_default_config(file = "configuration.yml")
-      data   = load_yml("config/#{file}.example", "defaults", false)
-      data ||= load_yml("config/#{file}", "defaults", false)
-      data ||= {}
-      return data
+      local || example
     end
 
-    def load_yml(file, env, raise_when_not_found = true)
+    def load_yml(file, env)
       path = File.join(self.root, file)
       return nil unless File.exists?(path)
       yml = YAML.load(ERB.new(File.read(path)).result)
 
       if yml[env].is_a?(Hash)
         return yml[env].deep_symbolize_keys
-      elsif raise_when_not_found
-        raise MissingConfigurationData.new("Configuration data for #{env} was not found in #{file}")
       else
         return nil
       end
@@ -119,8 +111,8 @@ module A9n
 
     private
 
-    def verify!(base, local)
-      missing_keys = base.keys - local.keys
+    def verify!(example, local)
+      missing_keys = example.keys - local.keys
       if missing_keys.any?
         raise MissingConfigurationVariables.new("Following variables are missing in your configuration file: #{missing_keys.join(",")}")
       end

data/lib/a9n/core_ext/hash.rb

@@ -1,5 +1,5 @@
 class Hash
-  # Hash#deep_symbolize_keys 
+  # Hash#deep_symbolize_keys
   # based on
   # https://github.com/svenfuchs/i18n/blob/master/lib/i18n/core_ext/hash.rb
   def deep_symbolize_keys
@@ -9,4 +9,9 @@ class Hash
       result
     }
   end unless self.method_defined?(:deep_symbolize_keys)
-end
+
+  def self.merge(*items)
+    return nil if items.compact.empty?
+    items.compact.inject({}){|sum, item| sum.merge!(item)}
+  end
+end

data/lib/a9n/version.rb

@@ -1,3 +1,3 @@
 module A9n
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/spec/a9n_spec.rb

@@ -75,14 +75,14 @@ describe A9n do
       before do
         expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", env).and_return(nil)
         expect(described_class).to receive(:load_yml).with("config/#{base_file}", env).and_return(nil)
-        expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults', false).never
-        expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults', false).never
+        expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults').and_return(nil)
+        expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults').and_return(nil)
         expect(described_class).to receive(:verify!).never
       end
       it 'raises expection'  do
         lambda {
           described_class.load
-        }.should raise_error(described_class::MissingConfigurationFile)
+        }.should raise_error(described_class::MissingConfigurationData)
       end
     end
 
@@ -90,8 +90,8 @@ describe A9n do
       before do
         expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", env).and_return(base_sample_config)
         expect(described_class).to receive(:load_yml).with("config/#{base_file}", env).and_return(nil)
-        expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults', false).and_return(base_default_config)
-        expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults', false).never
+        expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults').and_return(base_default_config)
+        expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults').and_return(nil)
 
         expect(described_class).to receive(:verify!).never
         described_class.load
@@ -113,8 +113,8 @@ describe A9n do
       before do
         expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", env).and_return(nil)
         expect(described_class).to receive(:load_yml).with("config/#{base_file}", env).and_return(local_sample_config)
-        expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults', false).and_return(nil)
-        expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults', false).and_return(local_default_config)
+        expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults').and_return(nil)
+        expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults').and_return(local_default_config)
         expect(described_class).to receive(:verify!).never
         described_class.load
       end
@@ -132,8 +132,8 @@ describe A9n do
         before do
           expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", env).and_return(base_sample_config)
           expect(described_class).to receive(:load_yml).with("config/#{base_file}", env).and_return(base_sample_config)
-          expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults', false).and_return(nil)
-          expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults', false).and_return(nil)
+          expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults').and_return(nil)
+          expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults').and_return(nil)
           described_class.load
         end
 
@@ -151,8 +151,8 @@ describe A9n do
         before do
           expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", env).and_return(base_sample_config)
           expect(described_class).to receive(:load_yml).with("config/#{base_file}", env).and_return(local_sample_config)
-          expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults', false).never
-          expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults', false).never
+          expect(described_class).to receive(:load_yml).with("config/#{base_file}.example", 'defaults').and_return(nil)
+          expect(described_class).to receive(:load_yml).with("config/#{base_file}", 'defaults').and_return(nil)
         end
         it 'raises expection'  do
           expect {
@@ -166,8 +166,8 @@ describe A9n do
       before do
         expect(described_class).to receive(:load_yml).with("config/#{extra_file}.example", env).and_return(base_sample_config)
         expect(described_class).to receive(:load_yml).with("config/#{extra_file}", env).and_return(nil)
-        expect(described_class).to receive(:load_yml).with("config/#{extra_file}.example", 'defaults', false).and_return(base_default_config)
-        expect(described_class).to receive(:load_yml).with("config/#{extra_file}", 'defaults', false).never
+        expect(described_class).to receive(:load_yml).with("config/#{extra_file}.example", 'defaults').and_return(base_default_config)
+        expect(described_class).to receive(:load_yml).with("config/#{extra_file}", 'defaults').and_return(nil)
 
         expect(described_class).to receive(:verify!).never
         described_class.load('mongo.yml')
@@ -227,12 +227,7 @@ describe A9n do
 
       context 'and has no data' do
         let(:env) { 'production' }
-
-        it 'raises expection'  do
-          expect {
-            subject
-          }.to raise_error(described_class::MissingConfigurationData)
-        end
+        it { should be_nil }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a9n
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies: []
 description: Simple tool for managing extra configuration in ruby/rails apps
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -52,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: a9n is a simple tool for managing extra configuration in ruby/rails apps