yaml_configuration 0.0.4 → 0.0.5

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+tmp/

data/lib/yaml_configuration/loader.rb

@@ -4,8 +4,9 @@ module YamlConfiguration
       combined_configuration = {}
       config_files.flatten.each do |config_file|
         loaded_config = load_yaml_config(config_file)
-        combined_configuration.deep_merge(loaded_config)
+        combined_configuration.deep_merge!(loaded_config)
       end
+      puts combined_configuration.inspect
       Configuration.new(combined_configuration)
     end
 

data/lib/yaml_configuration/version.rb

@@ -1,3 +1,3 @@
 module YamlConfiguration
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/tests/yaml_configuration/loader_tests.rb

@@ -0,0 +1,43 @@
+require_relative '../tests_setup.rb'
+require 'fileutils'
+require 'hash_deep_merge'
+
+module YamlConfiguration
+  class LoaderTests < MiniTest::Unit::TestCase
+    def test_that_the_yaml_configs_get_deep_merged
+      config_a = {'user' => {'name' => 'David', 'surname' => 'Santoro', 'middle' => 'Maximillian'}, 'role' => 'developer'}
+      config_b = {'user' => {'name' => 'John'}, 'role' => 'artist'}
+      config_c = {'user' => {'surname' => 'Locke'}, 'role' => 'messiah'}
+      
+      recreate_directory('tmp')
+      create_yaml_config_file(config_a, 'tmp/config_a.yml')
+      create_yaml_config_file(config_b, 'tmp/config_b.yml')
+      create_yaml_config_file(config_c, 'tmp/config_c.yml')
+
+      combined_config = Loader.new.load('tmp/config_a', 'tmp/config_b', 'tmp/config_c')
+
+      assert_equal 'John', combined_config.user.name
+      assert_equal 'Locke', combined_config.user.surname
+      assert_equal 'messiah', combined_config.role
+      assert_equal 'Maximillian', combined_config.user.middle
+
+      combined_config = Loader.new.load(['tmp/config_a', 'tmp/config_b', 'tmp/config_c'])
+
+      assert_equal 'John', combined_config.user.name
+    end
+
+    private
+    def recreate_directory(directory_path)
+      full_path = File.join(File.dirname(__FILE__), '../..',directory_path)
+      FileUtils.rm_rf full_path
+      FileUtils.mkdir_p full_path
+    end
+
+    def create_yaml_config_file(hash, file_path)
+      full_path = File.join(File.dirname(__FILE__),'../..', file_path)
+      File.open(full_path, 'w') do |file|
+        file.write(hash.to_yaml)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml_configuration
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &78671870 !ruby/object:Gem::Requirement
+  requirement: &70833570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78671870
+  version_requirements: *70833570
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &78671660 !ruby/object:Gem::Requirement
+  requirement: &70833290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78671660
+  version_requirements: *70833290
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &78671450 !ruby/object:Gem::Requirement
+  requirement: &70832770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78671450
+  version_requirements: *70832770
 - !ruby/object:Gem::Dependency
   name: hash-deep-merge
-  requirement: &78671210 !ruby/object:Gem::Requirement
+  requirement: &70832280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78671210
+  version_requirements: *70832280
 description: Load, merge and provide sensible error messages when using yaml based
   configuration
 email:
@@ -72,6 +72,7 @@ files:
 - lib/yaml_configuration/version.rb
 - tests/tests_setup.rb
 - tests/yaml_configuration/configuration_tests.rb
+- tests/yaml_configuration/loader_tests.rb
 - yaml_configuration.gemspec
 homepage: http://github.com/soulnafein/yaml_configuration
 licenses: []