rails_config 0.3.0 → 0.3.1

data/README.md

@@ -107,6 +107,10 @@ Config entries are compiled from:
     config/settings.yml
     config/settings/#{environment}.yml
     config/environments/#{environment}.yml
+    
+    config/settings.local.yml
+    config/settings/#{environment}.local.yml
+    config/environments/#{environment}.local.yml    
 
 Settings defined in files that are lower in the list override settings higher.
 
@@ -145,6 +149,16 @@ Example production environment config file:
 #{Rails.root}/config/environments/production.yml
 ```
 
+### Developer specific config files
+
+If you want to have local settings, specific to your machine or development environment, 
+you can use the following files, which are automatically `.gitignored` :
+
+    Rails.root.join("config", "settings.local.yml").to_s,
+    Rails.root.join("config", "settings", "#{Rails.env}.local.yml").to_s,
+    Rails.root.join("config", "environments", "#{Rails.env}.local.yml").to_s
+
+
 ### Adding sources at Runtime
 
 You can add new YAML config files at runtime. Just use:
@@ -163,6 +177,9 @@ Settings.add_source!("#{Rails.root}/config/settings/local.yml")
 Settings.reload!
 ```
 
+> Note: this is an example usage, it is easier to just use the default local files `settings.local.yml, settings/#{Rails.env}.local.yml and environments/#{Rails.env}.local.yml` 
+>       for your developer specific settings.
+
 ## Embedded Ruby (ERB)
 
 Embedded Ruby is allowed in the configuration files. See examples below.

data/lib/rails_config/options.rb

@@ -55,8 +55,8 @@ module RailsConfig
 
     def merge!(hash)
       current = to_hash
-      DeepMerge.deep_merge!(current, hash.dup)
-      marshal_load(__convert(hash).marshal_dump)
+      DeepMerge.deep_merge!(hash.dup, current)
+      marshal_load(__convert(current).marshal_dump)
       self
     end
 
@@ -77,6 +77,7 @@ module RailsConfig
       s = self.class.new
 
       h.each do |k, v|
+        k = k.to_s if !k.respond_to?(:to_sym) && k.respond_to?(:to_s)
         s.new_ostruct_member(k)
 
         if v.is_a?(Hash)

data/lib/rails_config/version.rb

@@ -1,3 +1,3 @@
 module RailsConfig
-  VERSION = '0.3.0'
-end
+  VERSION = '0.3.1'
+end

data/spec/fixtures/settings.yml

@@ -1,2 +1,3 @@
 size: 1
 server: google.com
+1: "one" 

data/spec/rails_config_spec.rb

@@ -4,15 +4,15 @@ describe RailsConfig do
 
   it "should load a basic config file" do
     config = RailsConfig.load_files(setting_path("settings.yml"))
-    config.size.should == 1
-    config.server.should == "google.com"
+    config.size.should eq 1
+    config.server.should eq "google.com"
   end
 
   it "should load 2 basic config files" do
     config = RailsConfig.load_files(setting_path("settings.yml"), setting_path("settings2.yml"))
-    config.size.should == 1
-    config.server.should == "google.com"
-    config.another.should == "something"
+    config.size.should eq 1
+    config.server.should eq "google.com"
+    config.another.should eq "something"
   end
 
   it "should load empty config for a missing file path" do
@@ -50,20 +50,20 @@ describe RailsConfig do
   it "should allow overrides" do
     files = [setting_path("settings.yml"), setting_path("development.yml")]
     config = RailsConfig.load_files(files)
-    config.server.should == "google.com"
-    config.size.should == 2
+    config.server.should eq "google.com"
+    config.size.should eq 2
   end
 
   it "should allow full reload of the settings files" do
     files = [setting_path("settings.yml")]
     RailsConfig.load_and_set_settings(files)
-    Settings.server.should == "google.com"
-    Settings.size.should == 1
+    Settings.server.should eq "google.com"
+    Settings.size.should eq 1
 
     files = [setting_path("settings.yml"), setting_path("development.yml")]
     Settings.reload_from_files(files)
-    Settings.server.should == "google.com"
-    Settings.size.should == 2
+    Settings.server.should eq "google.com"
+    Settings.size.should eq 2
   end
 
   context "Nested Settings" do
@@ -72,12 +72,12 @@ describe RailsConfig do
     end
 
     it "should allow nested sections" do
-      config.section.size.should == 3
+      config.section.size.should eq 3
     end
 
     it "should allow configuration collections (arrays)" do
-      config.section.servers[0].name.should == "yahoo.com"
-      config.section.servers[1].name.should == "amazon.com"
+      config.section.servers[0].name.should eq "yahoo.com"
+      config.section.servers[1].name.should eq "amazon.com"
     end
   end
 
@@ -87,12 +87,12 @@ describe RailsConfig do
     end
 
     it "should evaluate ERB tags" do
-      config.computed.should == 6
+      config.computed.should eq 6
     end
 
     it "should evaluated nested ERB tags" do
-      config.section.computed1.should == 1
-      config.section.computed2.should == 2
+      config.section.computed1.should eq 1
+      config.section.computed2.should eq 2
     end
   end
 
@@ -103,13 +103,13 @@ describe RailsConfig do
     end
 
     it "should merge hashes from multiple configs" do
-      config.inner.marshal_dump.keys.size.should == 3
-      config.inner2.inner2_inner.marshal_dump.keys.size.should == 3
+      config.inner.marshal_dump.keys.size.should eq 3
+      config.inner2.inner2_inner.marshal_dump.keys.size.should eq 3
     end
 
     it "should merge arrays from multiple configs" do
-      config.arraylist1.size.should == 6
-      config.arraylist2.inner.size.should == 6
+      config.arraylist1.size.should eq 6
+      config.arraylist2.inner.size.should eq 6
     end
   end
 
@@ -120,19 +120,19 @@ describe RailsConfig do
     end
 
     it "should allow overriding of bool settings" do
-      config.override_bool.should == false
-      config.override_bool_opposite.should == true
+      config.override_bool.should eq false
+      config.override_bool_opposite.should eq true
     end
   end
 
   context "Custom Configuration" do
     it "should have the default settings constant as 'Settings'" do
-      RailsConfig.const_name.should == "Settings"
+      RailsConfig.const_name.should eq "Settings"
     end
 
     it "should be able to assign a different settings constant" do
       RailsConfig.setup{ |config| config.const_name = "Settings2" }
-      RailsConfig.const_name.should == "Settings2"
+      RailsConfig.const_name.should eq "Settings2"
     end
   end
 
@@ -147,19 +147,19 @@ describe RailsConfig do
     end
 
     it "should map the hash values correctly" do
-      config.prices[1].should == 2.99
-      config.prices[5].should == 9.99
-      config.prices[15].should == 19.99
-      config.prices[30].should == 29.99
+      config.prices[1].should eq 2.99
+      config.prices[5].should eq 9.99
+      config.prices[15].should eq 19.99
+      config.prices[30].should eq 29.99
     end
   end
 
   context "Merging hash at runtime" do
     let(:config) { RailsConfig.load_files(setting_path("settings.yml")) }
-    let(:hash) { {:options => {:suboption => 'value'}} }
+    let(:hash) { {:options => {:suboption => 'value'}, :server => 'amazon.com'} }
     
     it 'should be chainable' do
-      config.merge!({}).should === config
+      config.merge!({}).should eq config
     end
     
     it 'should preserve existing keys' do
@@ -168,7 +168,33 @@ describe RailsConfig do
     
     it 'should recursively merge keys' do
       config.merge!(hash)
-      config.options.suboption.should == 'value'
+      config.options.suboption.should eq 'value'
+    end
+    
+    it 'should rewrite a merged value' do
+      expect { config.merge!(hash) }.to change{ config.server }.from('google.com').to('amazon.com')
+    end
+  end
+  
+  context "Merging nested hash at runtime" do
+    let(:config) { RailsConfig.load_files(setting_path("deep_merge/config1.yml")) }
+    let(:hash) { {:inner => {:something1 => 'changed1', :something3 => 'changed3'} } }
+    
+    it 'should preserve first level keys' do
+      expect { config.merge!(hash) }.to_not change{ config.keys }
+    end
+    
+    it 'should preserve nested key' do
+      config.merge!(hash)
+      config.inner.something2.should eq 'blah2'
+    end
+    
+    it 'should add new nested key' do
+      expect { config.merge!(hash) }.to change { config.inner.something3 }.from(nil).to("changed3")
+    end
+    
+    it 'should rewrite a merged value' do
+      expect { config.merge!(hash) }.to change{ config.inner.something1 }.from('blah1').to('changed1')
     end
   end
 
@@ -179,14 +205,14 @@ describe RailsConfig do
     end
 
     it "should access attributes using []" do
-      config.section['size'].should == 3
-      config.section[:size].should == 3
-      config[:section][:size].should == 3
+      config.section['size'].should eq 3
+      config.section[:size].should eq 3
+      config[:section][:size].should eq 3
     end
 
     it "should set values using []=" do
       config.section[:foo] = 'bar'
-      config.section.foo.should == 'bar'
+      config.section.foo.should eq 'bar'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,15 +155,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 128564019799295977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 128564019799295977
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides a Settings helper for rails3 that reads from config/settings.yml