mc-settings 0.1.0 → 0.1.1

data/README.rdoc

@@ -69,8 +69,8 @@ RAILS_ROOT/config/settings/local folder):
 The following is the sequence of loading explained:
 
 * Read all files in :files list in order, and load their settings.
-* Last file loaded overrides previous value (if already exist).
-* Load all #{path}/local/*.yml files to Settings, overriding common keys. Files are loaded in order sorted by name.
+* Last file loaded overrides recursively previous value (if already exist).
+* Load all #{path}/local/*.yml files to Settings, overriding recursively common keys. Files are loaded in order sorted by name.
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/setting.rb

@@ -1,5 +1,21 @@
 require 'singleton'
 require 'yaml'
+
+class Hash
+  def recursive_merge!(other)
+    other.keys.each do |k|
+      if self[k].is_a?(Array) && other[k].is_a?(Array)
+        self[k] += other[k]
+      elsif self[k].is_a?(Hash) && other[k].is_a?(Hash)
+        self[k].recursive_merge!(other[k])
+      else
+        self[k] = other[k]
+      end
+    end
+    self
+  end
+end
+
 class Setting
   class NotFound < RuntimeError; end
   class FileError < RuntimeError; end
@@ -145,7 +161,7 @@ class Setting
 
     files.flatten.each do |file|
       begin
-        @available_settings.merge!(YAML::load(File.open(file)) || {}) if File.exists?(file)
+        @available_settings.recursive_merge!(YAML::load(File.open(file)) || {}) if File.exists?(file)
       rescue Exception => e
         raise FileError.new("Error parsing file #{file}, with: #{e.message}")
       end
@@ -154,6 +170,4 @@ class Setting
     @loaded = true
     @available_settings
   end
-
-
 end

data/mc-settings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mc-settings}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edwin Cruz", "Colin Shield"]
-  s.date = %q{2010-12-28}
+  s.date = %q{2011-01-14}
   s.description = %q{implement custom keys indenendently of environment}
   s.email = %q{rubydev@modcloth.com}
   s.extra_rdoc_files = [

data/spec/mc_settings_spec.rb

@@ -10,7 +10,7 @@ describe Setting do
           :path  => "config/settings",
           :local => true)
     end
-    
+
     it 'should return test specific values' do
       Setting.available_settings['one'].should == "test"
       Setting.one.should == "test"
@@ -22,14 +22,13 @@ describe Setting do
     end
 
     it "handles multiple values" do
-      Setting['six'].should == {"default"=>"default value", "extra"=>"extra"}
+      Setting['six'].should == {"default"=>"default value", "extra"=>"recursively overriden", "deep_level"=>{"value"=>"even deeper level"}}
       Setting.available_settings['six']['default'].should == "default value"
-      Setting.available_settings['six']['extra'].should == "extra"
       Setting.seven.should == "seven from custom"
     end
 
     it "should support symbols as keys" do
-      Setting[:six].should == {"default"=>"default value", "extra"=>"extra"}
+      Setting[:six].should == {"default"=>"default value", "extra"=>"recursively overriden"}
     end
 
     it "handles default key" do
@@ -48,31 +47,60 @@ describe Setting do
     it "should returns false correctly" do
       Setting.flag_false.should be(false)
     end
+
+    it "should merge keys recursivelly" do
+      Setting.six(:extra).should == "recursively overriden"
+      Setting.six(:deep_level)[:value] = "even deeper level"
+    end
+
+    it "should create keys if it does not exist" do
+      Setting.test_specific.should == "exist"
+    end
+  end
+
+  context "When running with threads" do
+    it "should keep its values" do
+      3.times do |time|
+        Thread.new {
+          Proc.new{
+            Setting.available_settings.shoud_not be_empty
+          }
+        }
+      end
+    end
+  end
+
+  context "When running inside a proc" do
+    it "should keep its values" do
+      Proc.new{
+        Setting.available_settings.shoud_not be_empty
+      }
+    end
   end
 
   context "Test from file" do
     before :each do
       Setting.reload(
-         :files => ['sample.yml'],
-         :path => File.join(File.dirname(__FILE__)) + '/fixtures'
+          :files => ['sample.yml'],
+          :path  => File.join(File.dirname(__FILE__)) + '/fixtures'
       )
     end
 
     it 'should support [] syntax' do
       Setting['tax']['default'].should == 0.0
-      Setting['tax'].should == { 'default' => 0.0, 'california' => 7.5 }
+      Setting['tax'].should == {'default' => 0.0, 'california' => 7.5}
     end
 
     it 'should support method invocation syntax' do
       Setting.tax.should == 0.0
 
-      Setting.tax(:default).should     == Setting.tax
-      Setting.tax('default').should    == Setting.tax
-      Setting.tax(:california).should  == 7.5
+      Setting.tax(:default).should == Setting.tax
+      Setting.tax('default').should == Setting.tax
+      Setting.tax(:california).should == 7.5
 
-      Setting.states.should            == ['CA', 'WA', 'NY']
-      Setting.states(:default).should  == Setting.states
-      Setting.states(:ship_to).should  == ['CA', 'NY']
+      Setting.states.should == ['CA', 'WA', 'NY']
+      Setting.states(:default).should == Setting.states
+      Setting.states(:ship_to).should == ['CA', 'NY']
     end
 
     it 'should correctly process Boolean values' do

data/spec/support/settings_helper.rb

@@ -9,6 +9,8 @@ def stub_setting_files
     six:
       default: "default value"
       extra: "extra"
+      deep_level:
+        value: "even deeper level"
     seven:
       default: "seven"
     empty:
@@ -25,6 +27,9 @@ CONTENT
       three: 5
       four: "6"
     five: "test string"
+    six:
+      extra: "recursively overriden"
+    test_specific: "exist"
   CONTENT
 
   empty = <<-CONTENT

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mc-settings
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Edwin Cruz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -08:00
+date: 2011-01-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency