cjbottaro-app_config 1.1.0 → 1.2.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
-:major: 1
 :patch: 0
+:major: 1
+:minor: 2

data/app_config.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{app_config}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christopher J Bottaro"]
-  s.date = %q{2009-08-28}
+  s.date = %q{2009-09-08}
   s.description = %q{Application level configuration that supports YAML config file, inheritance, ERB, and object member notation.}
   s.email = %q{cjbottaro@alumni.cs.utexas.edu}
   s.extra_rdoc_files = [
@@ -33,12 +33,14 @@ Gem::Specification.new do |s|
      "test/empty1.yml",
      "test/empty2.yml",
      "test/environments.yml",
+     "test/override_with.yml",
      "uninstall.rb"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/cjbottaro/app_config}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Application level configuration.}
   s.test_files = [
     "test/app_config_test.rb",

data/lib/app_config.rb

@@ -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
   

data/test/app_config_test.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

data/test/override_with.yml

@@ -0,0 +1,3 @@
+size: 10
+section:
+  servers: [ {name: over.com}, {name: ride.com} ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cjbottaro-app_config
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Christopher J Bottaro
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -39,8 +39,9 @@ files:
 - test/empty1.yml
 - test/empty2.yml
 - test/environments.yml
+- test/override_with.yml
 - uninstall.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/cjbottaro/app_config
 post_install_message: 
 rdoc_options: