test/override_with.yml @@ -21,15 +21,21 @@ class ApplicationConfiguration def reload! conf1 = load_conf_file(@conf_path_1) conf2 = load_conf_file(@conf_path_2) - conf = recursive_merge(conf1, conf2) - @config = ClosedStruct.r_new(conf) + @config_hash = recursive_merge(conf1, conf2) + @config = ClosedStruct.r_new(@config_hash) end - def use_environment!(environment) - if @config.respond_to?(environment) - @config = @config.send(environment) - else - raise ArgumentError, "environment doesn't exist in app config: #{environment}" + def use_environment!(environment, options = {}) + raise ArgumentError, "environment doesn't exist in app config: #{environment}" \ + unless @config_hash.has_key?(environment.to_s) + + @config_hash = @config_hash[environment.to_s] + @config = @config.send(environment) + + if options[:override_with] and File.exist?(options[:override_with]) + overriding_config = load_conf_file(options[:override_with]) + @config_hash = recursive_merge(@config_hash, overriding_config) + @config = ClosedStruct.r_new(@config_hash) end end lib/app_config.rb @@ -75,4 +75,31 @@ class AppConfigTest < Test::Unit::TestCase assert_raise(NoMethodError){ config.emails.support } end + def test_use_environment_override_with + config = ApplicationConfiguration.new('test/environments.yml') + config.use_environment!("development", :override_with => "test/override_with.yml") + assert_equal 10, config.size + assert_equal "over.com", config.section.servers[0].name + assert_equal "ride.com", config.section.servers[1].name + assert_equal "google.com", config.server + assert_equal 6, config.computed + assert_equal "webmaster@domain.com", config.emails.webmaster + assert_equal "feedback@domain.com", config.emails.feedback + assert_raise(NoMethodError){ config.emails.support } + end + + def test_use_environment_override_with_no_file + config = ApplicationConfiguration.new('test/environments.yml') + config.use_environment!("development", :override_with => "test/non_existant.yml") + assert_equal 2, config.size + assert_equal "google.com", config.server + assert_equal 6, config.computed + assert_equal 3, config.section.size + assert_equal "yahoo.com", config.section.servers[0].name + assert_equal "amazon.com", config.section.servers[1].name + assert_equal "webmaster@domain.com", config.emails.webmaster + assert_equal "feedback@domain.com", config.emails.feedback + assert_raise(NoMethodError){ config.emails.support } + end + end test/app_config_test.rb 01ecf27f141973e1f5a7bcc1668c00339dea8e6f cjbottaro cjbottaro@alumni.cs.utexas.edu http://github.com/cjbottaro/app_config/commit/763359395fc622dd0beb8258b3f7c77b630f6d49 763359395fc622dd0beb8258b3f7c77b630f6d49 2009-09-08T10:32:25-07:00 2009-09-08T10:32:25-07:00 Issue #2 - implemented :override_with option for #use_environment! 11f01302245ce7e6adcf13e82de388a44dfec225 cjbottaro cjbottaro@alumni.cs.utexas.edu