simpleconfig 1.1.3 → 1.2.0

data/.gitignore

@@ -0,0 +1,8 @@
+# Bundler
+.bundle
+Gemfile.lock
+pkg/*
+
+# YARD
+.yardoc
+yardoc/

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+## master
+
+- Updated Rakefile.
+- Added support for Bundler.
+- Added ability to duplicate a config object using SimpleConfig::Config#dup (GH-14). [Thanks @andriusch]
+- Added SimpleConfig::Config#merge and SimpleConfig::Config#merge! (GH-14). [Thanks @andriusch]
+- Deprecated SimpleConfig::Utilities.
+- Deprecated SimpleConfig::ControllerMixin.
+
+## 1.1
+
+- Added #to_hash method (via markschmidt)
+
+## 1.0.2
+
+- Added 'application.rb' to the list of default config files for non-environment specific settings (via weppos)
+- SimpleConfig can be loaded using require 'simpleconfig' as well as 'simple_config'
+- Adhere to Rails conventions for submodules and directories (via lazyatom)
+
+## 1.0.1
+
+- Removed dependency on ActiveSupport
+- Converted from Rails plugin to a gem

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Luke Redpath
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README.textile → README.md}

@@ -7,7 +7,10 @@ One simple solution is to simply put all of your app configuration into a YAML f
 
 SimpleConfig was originally written against Rails 1.x and may still work but as of version 1.1.1 the minimum required Rails version is 2.3.5. You may be able to use it with older versions of Rails but YMMV.
 
-h2. Getting started
+WARNING: SimpleConfig 1.x is not fully compatible with Rails 3. It works, but the rake tasks are not automatically loaded. Please upgrade to SimpleConfig 2.0 if you are using Rails 3.
+
+
+## Getting started
 
 The plugin comes with a rake task to get you up and running quickly, so start by running that.
 
@@ -17,7 +20,7 @@ This will create a config/settings folder and a blank settings file for each of
 
 Now, if you open up the configuration.rb initializer, you will see something like this:
 
-<pre><code class="ruby">
+```ruby
 SimpleConfig.for :application do
 
   # your app configuration here
@@ -26,46 +29,46 @@ SimpleConfig.for :application do
   load File.join(Rails.root, 'config', "settings", "local.rb"),        :if_exists? => true
   
 end
-</code></pre>
+```
 
-This is where you can set any configuration variables that are required across all Rails environments. The <code>load</code> method works just like Ruby's built-in load method, except the contents of the file it loads are evaluated within the context of the <code>SimpleConfig.for</code> block. The <code>:if_exists?</code> flag, when set to true, means that the file will only be loaded if it exists, otherwise it will simply be ignored.
+This is where you can set any configuration variables that are required across all Rails environments. The `load` method works just like Ruby's built-in load method, except the contents of the file it loads are evaluated within the context of the `SimpleConfig.for` block. The `:if_exists?` flag, when set to true, means that the file will only be loaded if it exists, otherwise it will simply be ignored.
 
 Variables can be overwritten, and are defined in the order that they are loaded, so you can set up default values in the above file and override them in the environment files.
 
 As well as loading a settings file for your current Rails environment, a file called "local.rb" is loaded which is designed as a place for you to override variables specific to your own development environment -- you can just keep a copy of this locally without having to check it into your version control system[1].
 
-h2. Variables
+## Variables
 
-h3. Setting Variables
+### Setting Variables
 
-Setting variables is simple and will be familiar to anybody who has used Capistrano. Whether in your main <code>SimpleConfig.for</code> block in configuration.rb, or one of your external settings files, use the <code>set</code> method:
+Setting variables is simple and will be familiar to anybody who has used Capistrano. Whether in your main `SimpleConfig.for` block in configuration.rb, or one of your external settings files, use the `set` method:
 
-<pre><code class="ruby">
+```ruby
 SimpleConfig.for :application do
   set :my_variable, 'hello world'
 end
-</code></pre>
+```
 
 SimpleConfig also supports a form of namespacing that allows you to group logical sets of variables together:
 
-<pre><code class="ruby">
+```ruby
 SimpleConfig.for :application do
   group :awesome_stuff do
     set :my_variable, 'hello world'
   end
 end
-</code></pre>
+```
 
-Both the <code>set</code> and <code>load</code> methods are available within <code>group</code> blocks and files loaded inside groups will be evaluated in the context of that group.
+Both the `set` and `load` methods are available within `group` blocks and files loaded inside groups will be evaluated in the context of that group.
 
 Whilst I'd recommend not nesting your groups more than one-level, there is no limit on how deep they can be nested.
 
-h3. Unsetting variables
+### Unsetting variables
 
-Sometimes you might want to completely delete a variable from the collection. Simply setting its value to nil doesn't work because <code>nil</code> might be a valid value.
-You can delete a variable using the <code>unset</code> method.
+Sometimes you might want to completely delete a variable from the collection. Simply setting its value to nil doesn't work because `nil` might be a valid value.
+You can delete a variable using the `unset` method.
 
-<pre><code class="ruby">
+```ruby
 SimpleConfig.for :application do
   set :my_variable, 'hello world'
   
@@ -73,16 +76,16 @@ SimpleConfig.for :application do
   
   unset :my_variable
 end
-</code></pre>
+```
 
 For instance, this is useful to remove global settings at environment level instead of overwriting the default value with a nonsense-one.
-<code>unset</code> returns the value of the variable just in case you need to use it elsewhere.
+`unset` returns the value of the variable just in case you need to use it elsewhere.
 
-h3. Does a specific variable exist?
+### Does a specific variable exist?
 
-I don't know but you can check it yourself using <code>exists?</code> method.
+I don't know but you can check it yourself using `exists?` method.
 
-<pre><code class="ruby">
+```ruby
 config = SimpleConfig.for :application do
   set :my_variable, 'hello world'
 end
@@ -90,55 +93,55 @@ end
 # write some nice code 
 config.exists? :my_variable     # => true
 config.exists? :your_variable   # => false
-</code></pre>
+```
 
-h2. Accessing your configuration
+## Accessing your configuration
 
-SimpleConfig allows you set as many separate configurations as you like using the <code>SimpleConfig.for</code> method, which takes a symbol representing the configuration name, although most people will just create a single "application" config as above. To access this config from anywhere in your application, you can also use <code>SimpleConfig.for</code> method without a block, which always returns the named configuration object.
+SimpleConfig allows you set as many separate configurations as you like using the `SimpleConfig.for` method, which takes a symbol representing the configuration name, although most people will just create a single "application" config as above. To access this config from anywhere in your application, you can also use `SimpleConfig.for` method without a block, which always returns the named configuration object.
 
-It is worth pointing out that <code>SimpleConfig.for</code> provides an almost singleton-style access to a particular named config. Calling <code>SimpleConfig.for</code> with a block a second time for a particular named configuration will simply extend the existing configuration, not overwrite it.
+It is worth pointing out that `SimpleConfig.for` provides an almost singleton-style access to a particular named config. Calling `SimpleConfig.for` with a block a second time for a particular named configuration will simply extend the existing configuration, not overwrite it.
 
-Once you have a reference to your configuration object, you can access variables using method access. Given the above example, <code>:my_variable</code> would be accessed in the following way:
+Once you have a reference to your configuration object, you can access variables using method access. Given the above example, `:my_variable` would be accessed in the following way:
 
-<pre><code class="ruby">
+```ruby
 config = SimpleConfig.for(:application)
 config.my_variable # => "hello world"
-</code></pre>
+```
 
 Accessing grouped variables works as you would expect:
 
-<pre><code class="ruby">
+```ruby
 config = SimpleConfig.for(:application)
 config.awesome_stuff.my_variable # => "hello world"
-</code></pre>
+```
 
-h2. Using your configuration in your Rails app
+## Using your configuration in your Rails app
 
-The plugin provides a convenient mixin for your <code>ApplicationController</code> to make configuration access as simple as possible. Assuming a configuration called "application" (as in the above examples), it defines a <code>config</code> method which can be used in any of your controllers. It also defines this as a method as a view helper using the Rails <code>helper_method</code> macro so you can access configuration data in your views. 
+The plugin provides a convenient mixin for your `ApplicationController` to make configuration access as simple as possible. Assuming a configuration called "application" (as in the above examples), it defines a `config` method which can be used in any of your controllers. It also defines this as a method as a view helper using the Rails `helper_method` macro so you can access configuration data in your views. 
 
-Note - there is no direct way of accessing your configuration variables in your models other than making a direct call to <code>SimpleConfig.for</code>. I'd recommend designing your models in such a way that configuration data can be passed into them at runtime as method arguments by your controller to avoid coupling your model to SimpleConfig.
+Note - there is no direct way of accessing your configuration variables in your models other than making a direct call to `SimpleConfig.for`. I'd recommend designing your models in such a way that configuration data can be passed into them at runtime as method arguments by your controller to avoid coupling your model to SimpleConfig.
 
-To use the mixin, simply include it in your <code>ApplicationController</code>:
+To use the mixin, simply include it in your `ApplicationController`:
 
-<pre><code class="ruby">
+```ruby
 class ApplicationController < ActionController::Base
   include SimpleConfig::ControllerMixin
 end
-</code></pre>
+```
 
 Then in your controllers:
 
-<pre><code class="ruby">
+```ruby
 class MyController < ApplicationController
   def index
     render :text => config.my_config_variable
   end
 end
-</code></pre>
+```
 
-The mixin provides also a class-level <code>config</code> method to access the configuration when you don't have a controller instance available.
+The mixin provides also a class-level `config` method to access the configuration when you don't have a controller instance available.
 
-<pre><code class="ruby">
+```ruby
 class MyController < ApplicationController
   protect_from_forgery :secret => config.secret_token
 
@@ -146,6 +149,6 @@ class MyController < ApplicationController
     render :text => config.my_config_variable
   end
 end
-</code></pre>
+```
 
-fn1(footnote). In fact, I recommend you make sure your version control system ignores this file otherwise you risk checking in a file that will override values in production! If you are using Subversion, simply add local.rb to the svn:ignore property for the config/settings folder.
+fn1(footnote). In fact, I recommend you make sure your version control system ignores this file otherwise you risk checking in a file that will override values in production! If you are using Subversion, simply add local.rb to the svn:ignore property for the config/settings folder.

data/Rakefile

@@ -1,27 +1,11 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-require "rubygems"
-require "rubygems/package_task"
+require 'rubygems'
+require 'rubygems/package_task'
+require 'bundler'
 
-desc 'Default: run unit tests.'
-task :default => :test
 
-desc 'Test the simpleconfig plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+# Run test by default.
+task :default => :test
 
-desc 'Generate documentation for the simpleconfig plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Simpleconfig'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
 # This builds the actual gem. For details of what all these options
 # mean, and other ones you can add, check the documentation here:
@@ -30,40 +14,23 @@ end
 #
 spec = Gem::Specification.new do |s|
   s.name     = "simpleconfig"
-  s.version  = "1.1.3"
-  s.date     = "2010-09-13"
+  s.version  = "1.2.0"
   s.summary  = "Simple object-oriented application settings for Ruby applications"
-  s.email    = "luke@lukeredpath.co.uk"
-  s.homepage = "http://github.com/lukeredpath/simpleconfig"
   s.description = "SimpleConfig is a plugin designed to make application-wide configuration settings (e.g. in a Rails app) easy to set and access in an object-oriented fashion."
-  s.has_rdoc = false
+
   s.authors  = ["Luke Redpath"]
-  s.files    = [
-    "lib/simple_config.rb",
-    "lib/simple_config/controller_mixin.rb",
-    "lib/simple_config/utilities.rb",
-    "lib/tasks/simple_config.rake",
-    "init.rb",
-    "Rakefile",
-    "README.textile",
-    "templates/configuration.rb"
-  ]
-  s.test_files = [
-    "test/controller_mixin_test.rb",
-    "test/network_host_test.rb",
-    "test/simple_config_functional_test.rb",
-    "test/simple_config_test.rb",
-    "test/yaml_parser_test.rb"
-  ]
+  s.email    = "luke@lukeredpath.co.uk"
+  s.homepage = "http://github.com/lukeredpath/simpleconfig"
+
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths     = %w( lib )
+
+  s.add_development_dependency("rake")
+  s.add_development_dependency("yard")
+  s.add_development_dependency("mocha")
 end
 
-# This task actually builds the gem. We also regenerate a static
-# .gemspec file, which is useful if something (i.e. GitHub) will
-# be automatically building a gem for this project. If you're not
-# using GitHub, edit as appropriate.
-#
-# To publish your gem online, install the 'gemcutter' gem; Read more
-# about that here: http://gemcutter.org/pages/gem_docs
 Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
@@ -74,16 +41,51 @@ task :gemspec do
   File.open(file, "w") {|f| f << spec.to_ruby }
 end
 
-task :package => :gemspec
-
-desc 'Clear out RDoc and generated packages'
-task :clean => [:clobber_rdoc, :clobber_package] do
-  rm "#{spec.name}.gemspec"
+desc "Remove any temporary products, including gemspec"
+task :clean => [:clobber] do
+  rm "#{spec.name}.gemspec" if File.file?("#{spec.name}.gemspec")
 end
 
+desc "Remove any generated file"
+task :clobber => [:clobber_package]
+
+desc "Package the library and generates the gemspec"
+task :package => [:gemspec]
+
 desc "Release to RubyGems.org"
 task :release => :package do
   system("gem push pkg/#{spec.file_name}") &&
   system("git tag -a -m 'Tagged #{spec.version} release' v#{spec.version}") &&
   system("git push --tags")
 end
+
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.verbose = !!ENV["VERBOSE"]
+  t.warning = !!ENV["WARNING"]
+end
+
+
+require 'yard/rake/yardoc_task'
+
+YARD::Rake::YardocTask.new(:yardoc) do |y|
+  y.options = ["--output-dir", "yardoc"]
+end
+
+namespace :yardoc do
+  task :clobber do
+    rm_r "yardoc" rescue nil
+  end
+end
+
+task :clobber => "yardoc:clobber"
+
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r simple_config.rb"
+end

data/lib/simple_config.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 module SimpleConfig
 
   class << self
@@ -25,11 +23,18 @@ module SimpleConfig
   end
 
   class Config
+
     def initialize
-      @groups = {}
+      @groups   = {}
       @settings = {}
     end
 
+    def dup
+      self.class.new.tap do |duplicate|
+        duplicate.merge!(to_hash)
+      end
+    end
+
     def configure(&block)
       instance_eval(&block)
     end
@@ -51,7 +56,6 @@ module SimpleConfig
       @settings[key]
     end
 
-    #
     # Unsets any variable with given +key+
     # and returns variable value if it exists, nil otherwise.
     # Any successive call to exists? :key will return false.
@@ -64,12 +68,13 @@ module SimpleConfig
     #   unset :bar        # => 'foo'
     #   exists? :bar      # => false
     #
+    # @param  [Symbol] The key to unset.
+    # @return The current value for +:key+.
     def unset(key)
       singleton_class.send(:remove_method, key)
       @settings.delete(key)
     end
 
-    #
     # Returns whether a variable with given +key+ is set.
     #
     # Please note that this method doesn't care about variable value.
@@ -91,10 +96,16 @@ module SimpleConfig
     #   unset :bar
     #   exists? :bar      # => false
     #
+    # @param  [Symbol] The key to check.
+    # @return [Boolean] True if the key is set.
     def exists?(key)
       @settings.key?(key)
     end
 
+    def set?(key)
+      @settings.key?(key)
+    end
+
     def to_hash
       hash = @settings.dup
       @groups.each do |key,group|
@@ -103,6 +114,21 @@ module SimpleConfig
       hash
     end
 
+    def merge!(hash)
+      hash.each do |key, value|
+        if value.is_a?(Hash)
+          group(key.to_sym).merge!(value)
+        else
+          set(key.to_sym, value)
+        end
+      end
+      self
+    end
+
+    def merge(hash)
+      dup.merge!(hash)
+    end
+
     def load(external_config_file, options={})
       options = {:if_exists? => false}.merge(options)
 
@@ -118,24 +144,22 @@ module SimpleConfig
       end
     end
 
-    def set?(key)
-      @settings.key?(key)
-    end
+  private
 
-    private
-      def define_accessor(name, &block)
-        singleton_class.class_eval { define_method(name, &block) } unless respond_to?(name)
-      end
+    def define_accessor(name, &block)
+      singleton_class.class_eval { define_method(name, &block) } if !respond_to?(name) || exists?(name)
+    end
 
-      def singleton_class
-        class << self
-          self
-        end
+    def singleton_class
+      class << self
+        self
       end
+    end
   end
 
   class YAMLParser
     def initialize(raw_yaml_data)
+      require 'yaml'
       @data = YAML.load(raw_yaml_data)
     end
 
@@ -144,20 +168,8 @@ module SimpleConfig
     end
 
     def parse_into(config)
-      @data.each do |key, value|
-        parse(key, value, config)
-      end
+      config.merge!(@data)
     end
-
-    private
-      def parse(key, value, config)
-        if value.is_a?(Hash)
-          group = config.group(key.to_sym)
-          value.each { |key, value| parse(key, value, group) }
-        else
-          config.set(key.to_sym, value)
-        end
-      end
   end
 
 end

data/lib/simple_config/controller_mixin.rb

@@ -1,3 +1,9 @@
+warn <<-EOS
+DEPRECATION WARNING: SimpleConfig::ControllerMixin is deprecated and will be removed in SimpleConfig 2.0. If you really need this functionality, add the code to your app or consider creating a MicroGem.
+See http://jeffkreeftmeijer.com/2011/microgems-five-minute-rubygems/
+EOS
+
+
 module SimpleConfig
   module ControllerMixin
     

data/lib/simple_config/utilities.rb

@@ -1,5 +1,10 @@
 require 'uri'
 
+warn <<-EOS
+DEPRECATION WARNING: SimpleConfig::Utilities is deprecated and will be removed in SimpleConfig 2.0. Please package it as a Gem or MicroGem.
+See http://jeffkreeftmeijer.com/2011/microgems-five-minute-rubygems/
+EOS
+
 module SimpleConfig
   module Utilities
     class NetworkHost

data/lib/simpleconfig.rb

@@ -0,0 +1 @@
+require 'simple_config'

data/simpleconfig.gemspec

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "simpleconfig"
+  s.version = "1.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Luke Redpath"]
+  s.date = "2012-06-27"
+  s.description = "SimpleConfig is a plugin designed to make application-wide configuration settings (e.g. in a Rails app) easy to set and access in an object-oriented fashion."
+  s.email = "luke@lukeredpath.co.uk"
+  s.files = [".gitignore", "CHANGELOG.md", "Gemfile", "MIT-LICENSE", "README.md", "Rakefile", "init.rb", "lib/simple_config.rb", "lib/simple_config/controller_mixin.rb", "lib/simple_config/utilities.rb", "lib/simpleconfig.rb", "lib/tasks/simple_config.rake", "simpleconfig.gemspec", "templates/configuration.rb", "test/controller_mixin_test.rb", "test/network_host_test.rb", "test/simple_config_functional_test.rb", "test/simple_config_test.rb", "test/test_helper.rb", "test/yaml_parser_test.rb"]
+  s.homepage = "http://github.com/lukeredpath/simpleconfig"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Simple object-oriented application settings for Ruby applications"
+  s.test_files = ["test/controller_mixin_test.rb", "test/network_host_test.rb", "test/simple_config_functional_test.rb", "test/simple_config_test.rb", "test/test_helper.rb", "test/yaml_parser_test.rb"]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+    else
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+  end
+end

data/test/controller_mixin_test.rb

@@ -1,6 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
-
-require 'simple_config'
+require 'test_helper'
 require 'simple_config/controller_mixin'
 
 class RailsController

data/test/network_host_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
-
+require 'test_helper'
 require 'simple_config/utilities'
 
 class NetworkHostTest < Test::Unit::TestCase

data/test/simple_config_functional_test.rb

@@ -1,6 +1,3 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
-
-require 'simple_config'
 require 'fileutils'
 
 class SimpleConfigFunctionalTest < Test::Unit::TestCase

data/test/simple_config_test.rb

@@ -1,6 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
-
-require 'simple_config'
+require 'test_helper'
 
 class SimpleConfigConfigTest < Test::Unit::TestCase
 
@@ -8,6 +6,21 @@ class SimpleConfigConfigTest < Test::Unit::TestCase
     @config = SimpleConfig::Config.new
   end
 
+  def test_dup_creates_deep_clone
+    new_config = cascaded_test_config.dup
+    new_config.configure do
+      group :test_group do
+        set :inner_key, 'new_foo'
+      end
+      set :test, 'new_test'
+    end
+
+    assert_equal 'test-setting', cascaded_test_config.test
+    assert_equal 'some other value', cascaded_test_config.test_group.inner_key
+    assert_equal 'new_test', new_config.test
+    assert_equal 'new_foo', new_config.test_group.inner_key
+  end
+
   def test_should_be_able_to_set_config_values
     @config.set(:var_one, 'hello world')
     assert_equal 'hello world', @config.get(:var_one)
@@ -154,7 +167,26 @@ class SimpleConfigConfigTest < Test::Unit::TestCase
     assert_equal "new-test-setting", @config.test
   end
 
-  private
+  def test_config_merge_hash
+    config = SimpleConfig::Config.new
+    config.merge!(:example => {:foo => 'bar', :baz => 'qux'}, :test => 'foo')
+
+    assert_equal 'foo', config.test
+    assert_equal 'bar', config.example.foo
+    assert_equal 'qux', config.example.baz
+  end
+
+  def test_config_merge_hash_non_destructive
+    new_config = cascaded_test_config.merge(:test_group => {:inner_key => 'bar'}, :test => 'qux')
+
+    assert_equal 'test-setting', cascaded_test_config.test
+    assert_equal 'some other value', cascaded_test_config.test_group.inner_key
+    
+    assert_equal 'qux', new_config.test
+    assert_equal 'bar', new_config.test_group.inner_key
+  end
+
+private
 
   def cascaded_test_config
     SimpleConfig.for :simple_config_test do

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'test/unit'
+require 'mocha'
+
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'simple_config'

data/test/yaml_parser_test.rb

@@ -1,6 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[test_helper])
-
-require 'simple_config'
+require 'test_helper'
 
 class YAMLParserTest < Test::Unit::TestCase
   include SimpleConfig

metadata

@@ -1,81 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simpleconfig
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
 platform: ruby
-authors: 
+authors:
 - Luke Redpath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-13 00:00:00 Z
-dependencies: []
-
-description: SimpleConfig is a plugin designed to make application-wide configuration settings (e.g. in a Rails app) easy to set and access in an object-oriented fashion.
+date: 2012-06-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: SimpleConfig is a plugin designed to make application-wide configuration
+  settings (e.g. in a Rails app) easy to set and access in an object-oriented fashion.
 email: luke@lukeredpath.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
+- CHANGELOG.md
+- Gemfile
+- MIT-LICENSE
+- README.md
+- Rakefile
+- init.rb
 - lib/simple_config.rb
 - lib/simple_config/controller_mixin.rb
 - lib/simple_config/utilities.rb
+- lib/simpleconfig.rb
 - lib/tasks/simple_config.rake
-- init.rb
-- Rakefile
-- README.textile
+- simpleconfig.gemspec
 - templates/configuration.rb
 - test/controller_mixin_test.rb
 - test/network_host_test.rb
 - test/simple_config_functional_test.rb
 - test/simple_config_test.rb
+- test/test_helper.rb
 - test/yaml_parser_test.rb
 homepage: http://github.com/lukeredpath/simpleconfig
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -580664195664011592
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple object-oriented application settings for Ruby applications
-test_files: 
+test_files:
 - test/controller_mixin_test.rb
 - test/network_host_test.rb
 - test/simple_config_functional_test.rb
 - test/simple_config_test.rb
+- test/test_helper.rb
 - test/yaml_parser_test.rb