dacs 0.3.2 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/dacs.rb

@@ -7,4 +7,6 @@ require 'dacs/environment_source'
 require 'dacs/file_source'
 require 'dacs/default_source'
 require 'dacs/environment_source'
+require 'dacs/code_source'
 require 'dacs/app_config'
+

data/lib/dacs/app_config.rb

@@ -144,6 +144,19 @@ module Dacs
       end
     end
 
+    def merge(new_values)
+      self.clone.merge!(new_values)
+    end
+
+    def merge!(new_values)
+      new_values.each_pair do |k,v|
+        self[k.to_s] = ConfiguredValue.new(
+          CodeSource.new,
+          k.to_s,
+          v)
+      end
+    end
+
     def dump
       Hirb::Helpers::AutoTable.render(
         self.values,

data/lib/dacs/code_source.rb

@@ -0,0 +1,7 @@
+module Dacs
+  class CodeSource
+    def to_s
+      "set in code"
+    end
+  end
+end

data/spec/dacs/app_config_spec.rb

@@ -199,6 +199,36 @@ module Dacs
       end
     end
 
+    context "with values set from a file + values merged in" do
+      before :each do
+        @construct.file("config/foo_app.yml") do |f|
+          YAML.dump({
+              'development'=>{
+                'bar' => 'file_bar',
+                'baz' => 'file_baz'
+              }
+            }, 
+            f)
+        end
+        AppConfig.init!(@app_name, :logger => @logger) do |config|
+          config.key 'bar', :default => "baz"
+          config.key 'baz', :default => "ribbit"
+          config.key 'buz', :default => "moo"
+        end
+        AppConfig.merge!(:baz => 'merge_baz', 'buz' => 'merge_buz')
+      end
+
+      it "should contain the merged values" do
+        AppConfig['baz'].should == "merge_baz"
+        AppConfig['buz'].should == "merge_buz"
+      end
+
+      it "should know the merged values were set explicitly in code" do
+        AppConfig.source('baz').should =~ /code/i
+        AppConfig.source('buz').should =~ /code/i
+      end
+    end
+
     context "with a mix of default, file, and environment settings" do
       before :each do
         @construct.file("config/foo_app.yml") do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dacs
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Devver, Inc.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -04:00
+date: 2010-03-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - example/example.yml
 - lib/dacs.rb
 - lib/dacs/app_config.rb
+- lib/dacs/code_source.rb
 - lib/dacs/configured_value.rb
 - lib/dacs/default_source.rb
 - lib/dacs/environment_source.rb