rails_config 0.2.5 → 0.2.6

data/README.md

@@ -13,7 +13,7 @@ RailsConfig helps you easily manage environment specific Rails settings in an ea
 
 ## Compatibility
 
-* Rails 3.0
+* Rails 3.x
 * Padrino
 * Sinatra
 
@@ -23,35 +23,44 @@ For older versions of Rails and other Ruby apps, use [AppConfig](http://github.c
 
 Add this to your `Gemfile`:
 
-    gem "rails_config"
-
+```ruby
+gem "rails_config"
+```
 
 ## Installing on Padrino
 
 Add this to your `Gemfile`:
 
-    gem "rails_config"
+```ruby
+gem "rails_config"
+```
 
 in your app.rb, you'll also need to register RailsConfig
 
-    register RailsConfig
-
+```ruby
+register RailsConfig
+```
 
 ## Installing on Sinatra
 
 Add this to your `Gemfile`:
 
-    gem "rails_config"
+```ruby
+gem "rails_config"
+```
 
 in your app, you'll need to register RailsConfig. You'll also need to give it a root so it can find the config files.
 
-    set :root, File.dirname(__FILE__)
-    register RailsConfig
+```ruby
+set :root, File.dirname(__FILE__)
+register RailsConfig
+```
 
 It's also possible to initialize it manually within your configure block if you want to just give it some yml paths to load from.
 
-    RailsConfig.load_and_set_settings("/path/to/yaml1", "/path/to/yaml2", ...)
-
+```ruby
+RailsConfig.load_and_set_settings("/path/to/yaml1", "/path/to/yaml2", ...)
+```
 
 ## Customizing RailsConfig
 
@@ -70,11 +79,15 @@ This will generate `config/initializers/rails_config.rb` with a set of default s
 
 After installing this plugin, the `Settings` object will be available globally. Entries are accessed via object member notation:
 
-    Settings.my_config_entry
+```ruby
+Settings.my_config_entry
+```
 
 Nested entries are supported:
 
-    Settings.my_section.some_entry
+```ruby
+Settings.my_section.some_entry
+```
 
 If you have set a different constant name for the object in the initializer file, use that instead.
 
@@ -98,12 +111,14 @@ You can also reload the `Settings` object from different config files at runtime
 
 For example, in your tests if you want to test the production settings, you can:
 
-    Rails.env = "production"
-    Settings.reload_from_files(
-      Rails.root.join("config", "settings.yml").to_s,
-      Rails.root.join("config", "settings", "#{Rails.env}.yml").to_s,
-      Rails.root.join("config", "environments", "#{Rails.env}.yml").to_s
-    )
+```ruby
+Rails.env = "production"
+Settings.reload_from_files(
+  Rails.root.join("config", "settings.yml").to_s,
+  Rails.root.join("config", "settings", "#{Rails.env}.yml").to_s,
+  Rails.root.join("config", "environments", "#{Rails.env}.yml").to_s
+)
+```
 
 ### Environment specific config files
 
@@ -111,25 +126,33 @@ You can have environment specific config files. Environment specific config entr
 
 Example development environment config file:
 
-    #{Rails.root}/config/environments/development.yml
+```ruby
+#{Rails.root}/config/environments/development.yml
+```
 
 Example production environment config file:
 
-    #{Rails.root}/config/environments/production.yml
+```ruby
+#{Rails.root}/config/environments/production.yml
+```
 
 ### Adding sources at Runtime
 
 You can add new YAML config files at runtime. Just use:
 
-    Settings.add_source!("/path/to/source.yml")
-    Settings.reload!
+```ruby
+Settings.add_source!("/path/to/source.yml")
+Settings.reload!
+```
 
 This will use the given source.yml file and use its settings to overwrite any previous ones.
 
 One thing I like to do for my Rails projects is provide a local.yml config file that is .gitignored (so its independent per developer). Then I create a new initializer in `config/initializers/add_local_config.rb` with the contents
 
-    Settings.add_source!("#{Rails.root}/config/settings/local.yml")
-    Settings.reload!
+```ruby
+Settings.add_source!("#{Rails.root}/config/settings/local.yml")
+Settings.reload!
+```
 
 ## Embedded Ruby (ERB)
 
@@ -141,34 +164,46 @@ Consider the two following config files.
 
  #{Rails.root}/config/settings.yml:
 
-    size: 1
-    server: google.com
+```yaml
+size: 1
+server: google.com
+```
 
  #{Rails.root}/config/environments/development.yml:
 
-    size: 2
-    computed: <%= 1 + 2 + 3 %>
-    section:
-      size: 3
-      servers: [ {name: yahoo.com}, {name: amazon.com} ]
+```yaml
+size: 2
+computed: <%= 1 + 2 + 3 %>
+section:
+  size: 3
+  servers: [ {name: yahoo.com}, {name: amazon.com} ]
+```
 
 Notice that the environment specific config entries overwrite the common entries.
 
-    Settings.size   # => 2
-    Settings.server # => google.com
+```ruby
+Settings.size   # => 2
+Settings.server # => google.com
+```
 
 Notice the embedded Ruby.
 
-    Settings.computed # => 6
+```ruby
+Settings.computed # => 6
+```
 
 Notice that object member notation is maintained even in nested entries.
 
-    Settings.section.size # => 3
+```ruby
+Settings.section.size # => 3
+```
 
 Notice array notation and object member notation is maintained.
 
-    Settings.section.servers[0].name # => yahoo.com
-    Settings.section.servers[1].name # => amazon.com
+```ruby
+Settings.section.servers[0].name # => yahoo.com
+Settings.section.servers[1].name # => amazon.com
+```
 
 ## Authors
 

data/lib/rails_config/integration/rails.rb

@@ -6,12 +6,12 @@ module RailsConfig
 
           # manually load the custom initializer before everything else
           initializer :load_custom_rails_config, :before => :bootstrap_hook do
-            initializer = Rails.root.join("config", "initializers", "rails_config")
+            initializer = Rails.root.join("config", "initializers", "rails_config.rb")
             require initializer if File.exist?(initializer)
           end
 
           # Parse the settings before any of the initializers
-          ActiveSupport.on_load :before_configuration, :yield => true do
+          initializer :load_rails_config_settings, :after => :load_custom_rails_config do
             RailsConfig.load_and_set_settings(
               Rails.root.join("config", "settings.yml").to_s,
               Rails.root.join("config", "settings", "#{Rails.env}.yml").to_s,

data/lib/rails_config/options.rb

@@ -53,6 +53,13 @@ module RailsConfig
       to_hash.to_json(*args)
     end
 
+    def merge!(hash)
+      current = to_hash
+      DeepMerge.deep_merge!(current, hash.dup)
+      marshal_load(__convert(hash).marshal_dump)
+      self
+    end
+    
     protected
 
     # Recursively converts Hashes to Options (including Hashes inside Arrays)

data/lib/rails_config/version.rb

@@ -1,3 +1,3 @@
 module RailsConfig
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/rails_config_spec.rb

@@ -154,4 +154,21 @@ describe RailsConfig do
     end
   end
 
+  context "Merging hash at runtime" do
+    let(:config) { RailsConfig.load_files(setting_path("settings.yml")) }
+    let(:hash) { {:options => {:suboption => 'value'}} }
+    
+    it 'should be chainable' do
+      config.merge!({}).should === config
+    end
+    
+    it 'should preserve existing keys' do
+      expect { config.merge!({}) }.to_not change{ config.keys }
+    end
+    
+    it 'should recursively merge keys' do
+      config.merge!(hash)
+      config.options.suboption.should == 'value'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_config
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70334355103200 !ruby/object:Gem::Requirement
+  requirement: &70284216610960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334355103200
+  version_requirements: *70284216610960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70334355101580 !ruby/object:Gem::Requirement
+  requirement: &70284216610240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334355101580
+  version_requirements: *70284216610240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334355100780 !ruby/object:Gem::Requirement
+  requirement: &70284216609340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70334355100780
+  version_requirements: *70284216609340
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70334355099860 !ruby/object:Gem::Requirement
+  requirement: &70284216608320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334355099860
+  version_requirements: *70284216608320
 - !ruby/object:Gem::Dependency
   name: growl-glue
-  requirement: &70334351057480 !ruby/object:Gem::Requirement
+  requirement: &70284216607660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334351057480
+  version_requirements: *70284216607660
 description: Easy to use Settings helper that loads its data in from config/settings.yml.
   Handles adding multiple sources, and easy reloading.
 email:
@@ -130,15 +130,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2569931913119763966
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2569931913119763966
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Provides a Settings helper for rails3 that reads from config/settings.yml